From f5d2d809a7d6da3a65cab96473b6af171f011184 Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Sun, 17 Aug 2014 16:44:22 +0000 Subject: [PATCH] New req and resp buffer Some testing code included. FossilOrigin-Name: 6ebc5c19d53ac18eb0e857fc8735917d947f8e879489809dab7c2b33b232b3cf --- src/capwap/cwsend_join_response.c | 32 ++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/capwap/cwsend_join_response.c b/src/capwap/cwsend_join_response.c index 0bcf42c3..d8b20939 100644 --- a/src/capwap/cwsend_join_response.c +++ b/src/capwap/cwsend_join_response.c @@ -3,20 +3,46 @@ #include "capwap.h" +#include "capwap_cisco.h" #include "conn.h" void cwsend_join_response(struct conn * conn,int seqnum, int rc, struct radioinfo * radioinfo, struct ac_info * acinfo, struct wtpinfo * wtpinfo) { - struct cwmsg * cwmsg = &conn->swm; - cwmsg_init(cwmsg,conn->buffer,CWMSG_JOIN_RESPONSE,seqnum,radioinfo); + struct cwmsg * cwmsg = &conn->resp_msg; + cwmsg_init(cwmsg,conn->resp_buffer,CWMSG_JOIN_RESPONSE,seqnum,NULL); + /* mandatory messagesg elements */ cwmsg_addelem_result_code(cwmsg,rc); cwmsg_addelem_ac_descriptor(cwmsg,acinfo); - cwmsg_addelem(cwmsg,CWMSGELEM_AC_NAME,acinfo->ac_name,strlen((char*)acinfo->ac_name)); cwmsg_addelem(cwmsg,CWMSGELEM_ECN_SUPPORT,&acinfo->ecn_support,sizeof(uint8_t)); cwmsg_addelem_ctrl_ip_addrs(cwmsg,acinfo); cwmsg_addelem_cw_local_ip_addr(cwmsg,conn); + + + /* */ + cwmsg_addelem_image_identifier(cwmsg,CW_VENDOR_ID_CISCO,(uint8_t*)"tobias",strlen("tobias")); + + + +// uint8_t buffer[]="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; +// buffer[0]=0; /* Mwar Type */ +// buffer[1]=1; /* h/w version */ +// buffer[2]=2; /* h/w Release */ +// buffer[3]=0; /* h/w Maint */ +// buffer[4]=3; /* h/w Build */ + +// buffer[5]=5; /* s/w version */ +// buffer[6]=0; /* s/w Release */ +// buffer[7]=19; /* s/w Maint */ +// buffer[8]=3; /* s/w Build */ + +// *((uint16_t*)(buffer+9))=htons(13); /* Active MS */ +// *((uint16_t*)(buffer+9+2))=htons(23); /* Supported MS */ +// *((uint16_t*)(buffer+9+4))=htons(5); /* Active RAD's */ +// *((uint16_t*)(buffer+9+6))=htons(15); /* Supported RAD's */ +// cwmsg_addelem_vendor_specific_payload(cwmsg,CW_VENDOR_ID_CISCO, 205, buffer,4); + conn_send_response(conn,cwmsg,seqnum);