planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compiles w/o warnings with gcc

Browse Source 
FossilOrigin-Name: 8aeb5208592d4c31a07b3eba10aa247483f9648fbaba38eb844cb02e074f31b9
This commit is contained in:
7u83@mail.ru 2018-03-25 08:35:53 +00:00
parent 847781bf7c
commit f136a0f401
16 changed files with 60 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cw/conn_process_packet.c
View File

@ -75,8 +75,8 @@ void cw_init_request(struct conn *conn, int msg_id)
uint8_t *msgptr; uint8_t *msgptr;
/* zero the first 8 bytes */ /* zero the first 8 bytes */
cw_put_dword(buffer + 0, 0); cw_set_dword(buffer + 0, 0);
cw_put_dword(buffer + 4, 0); cw_set_dword(buffer + 4, 0);
/* unencrypted */ /* unencrypted */
cw_set_hdr_preamble(buffer, CAPWAP_VERSION << 4 | 0); cw_set_hdr_preamble(buffer, CAPWAP_VERSION << 4 | 0);
@ -100,8 +100,8 @@ void cw_init_request(struct conn *conn, int msg_id)
void cw_init_data_msg(struct conn *conn) void cw_init_data_msg(struct conn *conn)
{ {
uint8_t *buffer = conn->req_buffer; uint8_t *buffer = conn->req_buffer;
cw_put_dword(buffer + 0, 0); cw_set_dword(buffer + 0, 0);
cw_put_dword(buffer + 4, 0); cw_set_dword(buffer + 4, 0);
/* unencrypted */ /* unencrypted */
cw_set_hdr_preamble(buffer, CAPWAP_VERSION << 4 | 0); cw_set_hdr_preamble(buffer, CAPWAP_VERSION << 4 | 0);

4
src/cw/conn_send_msg.c
View File

@ -31,7 +31,7 @@ int conn_send_msg(struct conn * conn, uint8_t *rawmsg)
while (packetlen>mtu){ while (packetlen>mtu){
cw_set_hdr_flags(rawmsg,CAPWAP_FLAG_HDR_F,1); cw_set_hdr_flags(rawmsg,CAPWAP_FLAG_HDR_F,1);
cw_put_dword(ptr+4, conn->fragid<<16 | fragoffset<<3 ); cw_set_dword(ptr+4, conn->fragid<<16 | fragoffset<<3 );
cw_dbg_pkt(DBG_PKT_OUT,conn,ptr,mtu,(struct sockaddr*)&conn->addr); cw_dbg_pkt(DBG_PKT_OUT,conn,ptr,mtu,(struct sockaddr*)&conn->addr);
@ -52,7 +52,7 @@ int conn_send_msg(struct conn * conn, uint8_t *rawmsg)
else else
cw_set_hdr_flags(rawmsg,CAPWAP_FLAG_HDR_F,0); cw_set_hdr_flags(rawmsg,CAPWAP_FLAG_HDR_F,0);
cw_put_dword(ptr+4, conn->fragid<<16 | fragoffset<<3 ); cw_set_dword(ptr+4, conn->fragid<<16 | fragoffset<<3 );
cw_dbg_pkt(DBG_PKT_OUT,conn,ptr,packetlen,(struct sockaddr*)&conn->addr); cw_dbg_pkt(DBG_PKT_OUT,conn,ptr,packetlen,(struct sockaddr*)&conn->addr);

15
src/cw/cw.h
View File

@ -178,12 +178,12 @@ void cw_set_hdr_rid(uint8_t * th, int rid);
*/ */
#define cw_set_datamsg_elems_len(msgptr,len) (cw_put_word(msgptr,len)); #define cw_set_datamsg_elems_len(msgptr,len) (cw_put_word(msgptr,len));
#define cw_set_msg_id(msgptr,t) cw_put_dword(msgptr,t) #define cw_set_msg_id(msgptr,t) cw_set_dword(msgptr,t)
#define cw_set_msg_type(msgptr,t) cw_set_msg_id(msgptr,t) #define cw_set_msg_type(msgptr,t) cw_set_msg_id(msgptr,t)
#define cw_set_msg_seqnum(msgptr,s) cw_put_byte( (msgptr) +4,s); #define cw_set_msg_seqnum(msgptr,s) cw_set_byte( (msgptr) +4,s);
#define cw_set_msg_elems_len(msgptr,n) (cw_put_word((msgptr)+5,((n)+3))) #define cw_set_msg_elems_len(msgptr,n) (cw_set_word((msgptr)+5,((n)+3)))
#define cw_set_msg_flags(msgptr,f) (cw_put_byte( (msgptr)+7,f)) #define cw_set_msg_flags(msgptr,f) (cw_set_byte( (msgptr)+7,f))
/** /**
* Check if a message id is from request msg * Check if a message id is from request msg
@ -267,8 +267,13 @@ int cw_set_hdr_rmac(uint8_t * th, bstr_t rmac);
*/ */
#define cw_put_elem_hdr(dst,type,len) \ #define cw_put_elem_hdr(dst,type,len) \
(cw_put_dword(dst, (((uint32_t)type)<<16) | (len)),4) (cw_set_dword(dst, (((uint32_t)type)<<16) | (len)),4)
/**
* same as #cw_put_elem_hdrm but without return value
*/
#define cw_set_elem_hdr(dst,type,len) \
(cw_set_dword(dst, (((uint32_t)type)<<16) | (len)))
int cw_put_elem_vendor_hdr(uint8_t * dst, uint32_t vendorid, int cw_put_elem_vendor_hdr(uint8_t * dst, uint32_t vendorid,
uint16_t elemid, uint16_t len); uint16_t elemid, uint16_t len);

2
src/cw/cw_format_scan_hex_bytes.c
View File

@ -15,7 +15,7 @@ int cw_format_scan_hex_bytes(uint8_t *dst,const char *s, int len)
int rc ; int rc ;
int err=0; int err=0;
int val; int val;
int c; unsigned int c;
int i; int i;
if ( len & 1){ if ( len & 1){

18
src/cw/cw_inline.c
View File

@ -133,9 +133,9 @@ int cw_put_elem_vendor_hdr(uint8_t * dst, uint32_t vendorid,
uint16_t elemid, uint16_t len) uint16_t elemid, uint16_t len)
{ {
cw_put_elem_hdr(dst, CAPWAP_ELEM_VENDOR_SPECIFIC_PAYLOAD, len + 6); cw_set_elem_hdr(dst, CAPWAP_ELEM_VENDOR_SPECIFIC_PAYLOAD, len + 6);
cw_put_dword(dst + 4, vendorid); cw_set_dword(dst + 4, vendorid);
cw_put_word(dst + 8, elemid); cw_set_word(dst + 8, elemid);
return 10; return 10;
} }
@ -166,7 +166,7 @@ int cw_addelem_bstr(uint8_t * dst, uint16_t type, const bstr_t bstr)
int cw_put_elem_result_code(uint8_t * dst, uint32_t code) int cw_put_elem_result_code(uint8_t * dst, uint32_t code)
{ {
cw_put_dword(dst + 4, code); cw_set_dword(dst + 4, code);
return 4 + cw_put_elem_hdr(dst, CW_ELEM_RESULT_CODE, 4); return 4 + cw_put_elem_hdr(dst, CW_ELEM_RESULT_CODE, 4);
} }
@ -187,15 +187,15 @@ int cw_put_version(uint8_t * dst, uint16_t subelem_id, bstrv_t v)
int cw_put_elem_radio_operational_state(uint8_t * dst, int rid, int state, int cause) { int cw_put_elem_radio_operational_state(uint8_t * dst, int rid, int state, int cause) {
cw_put_byte(dst+4,rid); cw_set_byte(dst+4,rid);
cw_put_byte(dst+5,state); cw_set_byte(dst+5,state);
cw_put_byte(dst+6,cause); cw_set_byte(dst+6,cause);
return 3+cw_put_elem_hdr(dst,CW_ELEM_RADIO_OPERATIONAL_STATE,3); return 3+cw_put_elem_hdr(dst,CW_ELEM_RADIO_OPERATIONAL_STATE,3);
} }
int cw_put_elem_radio_administrative_state(uint8_t * dst, int rid, int state) { int cw_put_elem_radio_administrative_state(uint8_t * dst, int rid, int state) {
cw_put_byte(dst+4,rid); cw_set_byte(dst+4,rid);
cw_put_byte(dst+5,state); cw_set_byte(dst+5,state);
return 2+cw_put_elem_hdr(dst,CW_ELEM_RADIO_ADMINISTRATIVE_STATE,2); return 2+cw_put_elem_hdr(dst,CW_ELEM_RADIO_ADMINISTRATIVE_STATE,2);
} }

12
src/cw/cw_ktv_idx_get.c
View File

@ -3,15 +3,15 @@
void * ktvn(struct mavl *t ,const void *search) void * ktvn(struct mavl *t ,const void *search)
{ {
struct mavlnode *n,*lastl,*lastb; struct mavlnode *n,/**lastl,*/*lastb;
lastb = NULL; lastl=NULL; lastb = NULL; /*lastl=NULL;*/
n = t->root; n = t->root;
while(n){ while(n){
int rc; int rc;
const cw_KTV_t *c1,*c2; /* const cw_KTV_t;*//* *c1,*c2;*/
c1=search; /*c1=search;
c2=mavlnode_dataptr(n); c2=mavlnode_dataptr(n);
*/
rc = t->cmp(search,mavlnode_dataptr(n)); rc = t->cmp(search,mavlnode_dataptr(n));
@ -23,7 +23,7 @@ void * ktvn(struct mavl *t ,const void *search)
} }
if (rc<0){ if (rc<0){
lastl = n; /*lastl = n;*/
if (n->left==NULL){ if (n->left==NULL){
return mavlnode_dataptr(lastb); return mavlnode_dataptr(lastb);

2
src/cw/cw_ktv_readline.c
View File

@ -117,7 +117,7 @@ static int read_type(FILE *f, char *type, int max_len, struct parser *p)
if (c==':'){ if (c==':'){
unget_char(c,f,p); unget_char(c,f,p);
sprintf(type,""); sprintf(type,"%s","");
return 0; return 0;
} }

4
src/cw/cw_put_elem_radio_operational_state.c
View File

@ -14,7 +14,7 @@ int xcw_put_elem_radio_operational_state(uint8_t * dst, int rid, int os, int d7m
uint8_t *d=dst; uint8_t *d=dst;
/* Put the radio ID */ /* Put the radio ID */
cw_put_byte(d+4,rid); cw_set_byte(d+4,rid);
if ( d7mode ){ if ( d7mode ){
/* Isolate Oper Sate from cause */ /* Isolate Oper Sate from cause */
@ -28,7 +28,7 @@ int xcw_put_elem_radio_operational_state(uint8_t * dst, int rid, int os, int d7m
} }
/* Put oper state */ /* Put oper state */
cw_put_word(d+5,os); cw_set_word(d+5,os);
d+=3+cw_put_elem_hdr(d,CW_ELEM_RADIO_OPERATIONAL_STATE,3); d+=3+cw_put_elem_hdr(d,CW_ELEM_RADIO_OPERATIONAL_STATE,3);
return d-dst; return d-dst;

6
src/cw/cw_put_image_data.c
View File

@ -8,16 +8,16 @@ int cw_put_image_data(uint8_t *dst,FILE *infile)
int bytes = fread(dst+1,1,1024,infile); int bytes = fread(dst+1,1,1024,infile);
if (ferror(infile)){ if (ferror(infile)){
cw_put_byte(dst+0,5); cw_set_byte(dst+0,5);
return 1; return 1;
} }
if ( feof(infile)){ if ( feof(infile)){
/* Last image block */ /* Last image block */
cw_put_byte(dst,2); cw_set_byte(dst,2);
} }
else{ else{
cw_put_byte(dst,1); cw_set_byte(dst,1);
} }
return bytes+1; return bytes+1;

6
src/cw/dbg.c
View File

@ -244,7 +244,7 @@ void cw_dbg_pkt(int level, struct conn *conn, uint8_t * packet, int len,
struct sockaddr *from) struct sockaddr *from)
{ {
int hlen; /* int hlen;*/
char buf[1024]; char buf[1024];
if (!cw_dbg_is_level(level)) if (!cw_dbg_is_level(level))
@ -255,7 +255,7 @@ void cw_dbg_pkt(int level, struct conn *conn, uint8_t * packet, int len,
else else
cw_format_pkt_hdr(buf, 0, packet, len, from); cw_format_pkt_hdr(buf, 0, packet, len, from);
hlen = cw_get_hdr_msg_offset(packet); /* hlen = cw_get_hdr_msg_offset(packet);*/
cw_dbg(level, "%s", buf); cw_dbg(level, "%s", buf);
@ -483,7 +483,7 @@ void cw_dbg_elem(int level, struct conn *conn, int msg,
sprintf(vendorname,"Vendor %s",cw_strvendor(handler->vendor)); sprintf(vendorname,"Vendor %s",cw_strvendor(handler->vendor));
} }
else{ else{
sprintf(vendorname,""); sprintf(vendorname,"%s","");
} }

2
src/cw/lw.h
View File

@ -50,7 +50,7 @@
* Same as #lw_set_byte, but w/o return value * Same as #lw_set_byte, but w/o return value
*/ */
#define lw_set_byte(dst,b) \ #define lw_set_byte(dst,b) \
(*(dst)=b); (*(dst)=b)
/** /**
* Same as #lw_set_word, but no return value * Same as #lw_set_word, but no return value

12
src/cw/lw_addelem.c
View File

@ -22,12 +22,12 @@ int lw_addelem(uint8_t*dst, uint8_t type, uint8_t *msgelem, uint16_t len)
int lw_addelem_vendor_specific(uint8_t *dst,uint32_t vendor_id,uint16_t elem_id, uint8_t *value, int len) int lw_addelem_vendor_specific(uint8_t *dst,uint32_t vendor_id,uint16_t elem_id, uint8_t *value, int len)
{ {
int l ; int l ;
lw_put_dword(dst+3,vendor_id); lw_set_dword(dst+3,vendor_id);
lw_put_word(dst+7,elem_id); lw_set_word(dst+7,elem_id);
memcpy(dst+9,value,len); memcpy(dst+9,value,len);
l= len+9; l= len+9;
*dst=LW_ELEM_VENDOR_SPECIFIC; *dst=LW_ELEM_VENDOR_SPECIFIC;
lw_put_word(dst+1,l); lw_set_word(dst+1,l);
return l; return l;
} }
@ -37,9 +37,9 @@ int lw_addelem_vendor_specific(uint8_t *dst,uint32_t vendor_id,uint16_t elem_id,
*/ */
int lw_addelem_cisco_padding(uint8_t *dst, int len) int lw_addelem_cisco_padding(uint8_t *dst, int len)
{ {
lw_put_dword(dst+3,LW_VENDOR_ID_CISCO); lw_set_dword(dst+3,LW_VENDOR_ID_CISCO);
lw_put_word(dst+7,LW_CISCO_PATH_MTU); lw_set_word(dst+7,LW_CISCO_PATH_MTU);
lw_put_word(dst+9,len); lw_set_word(dst+9,len);
memset(dst+11,0,len); memset(dst+11,0,len);
return lw_put_elem_hdr(dst,LW_ELEM_VENDOR_SPECIFIC,11+len); return lw_put_elem_hdr(dst,LW_ELEM_VENDOR_SPECIFIC,11+len);
} }

4
src/cw/lw_inline.c
View File

@ -58,8 +58,8 @@ int lw_put_elem_hdr(uint8_t *dst,uint8_t type,uint16_t len)
int lw_put_vendor(uint8_t * dst, uint32_t vendorid, int lw_put_vendor(uint8_t * dst, uint32_t vendorid,
uint16_t elemid, uint16_t len) uint16_t elemid, uint16_t len)
{ {
lw_put_dword(dst + 0, vendorid); lw_set_dword(dst + 0, vendorid);
lw_put_word(dst + 4, elemid); lw_set_word(dst + 4, elemid);
return 6; return 6;
} }

8
src/cw/lw_put_cisco_path_mtu.c
View File

@ -35,10 +35,10 @@
*/ */
int lw_put_cisco_path_mtu(uint8_t *dst, uint16_t max, uint16_t padding) int lw_put_cisco_path_mtu(uint8_t *dst, uint16_t max, uint16_t padding)
{ {
lw_put_dword(dst,LW_VENDOR_ID_CISCO); lw_set_dword(dst,LW_VENDOR_ID_CISCO);
lw_put_word(dst+4,LW_CISCO_PATH_MTU); lw_set_word(dst+4,LW_CISCO_PATH_MTU);
lw_put_word(dst+6,max); lw_set_word(dst+6,max);
lw_put_word(dst+8,padding+4); lw_set_word(dst+8,padding+4);
memset(dst+10,0,padding); memset(dst+10,0,padding);
return padding+10; return padding+10;
} }

8
src/cw/lw_put_image_data.c
View File

@ -7,21 +7,21 @@ int lw_put_image_data(uint8_t *dst,FILE *infile)
uint16_t checksum; uint16_t checksum;
int bytes; int bytes;
if ( feof(infile)){ if ( feof(infile)){
lw_put_byte(dst+0,1); lw_set_byte(dst+0,1);
return 1; return 1;
} }
bytes = fread(dst+3,1,LWAPP_BLOCKSIZE_IMAGE_DATA,infile); bytes = fread(dst+3,1,LWAPP_BLOCKSIZE_IMAGE_DATA,infile);
if ( ferror(infile)) { if ( ferror(infile)) {
lw_put_byte(dst+0,5); lw_set_byte(dst+0,5);
return 1; return 1;
} }
lw_put_byte(dst,3); lw_set_byte(dst,3);
checksum = lw_checksum(dst+3,bytes); checksum = lw_checksum(dst+3,bytes);
lw_put_word(dst+1,checksum); lw_set_word(dst+1,checksum);
return bytes+3; return bytes+3;
} }

4
src/cw/send.c
View File

@ -33,7 +33,7 @@ int conn_send_data_msg(struct conn * conn, uint8_t *rawmsg,int len)
while (packetlen>mtu){ while (packetlen>mtu){
cw_set_hdr_flags(rawmsg,CAPWAP_FLAG_HDR_F,1); cw_set_hdr_flags(rawmsg,CAPWAP_FLAG_HDR_F,1);
cw_put_dword(ptr+4, conn->fragid<<16 | fragoffset<<3 ); cw_set_dword(ptr+4, conn->fragid<<16 | fragoffset<<3 );
cw_dbg_pkt(DBG_PKT_OUT,conn,ptr,mtu,(struct sockaddr*)&conn->addr); cw_dbg_pkt(DBG_PKT_OUT,conn,ptr,mtu,(struct sockaddr*)&conn->addr);
@ -54,7 +54,7 @@ int conn_send_data_msg(struct conn * conn, uint8_t *rawmsg,int len)
else else
cw_set_hdr_flags(rawmsg,CAPWAP_FLAG_HDR_F,0); cw_set_hdr_flags(rawmsg,CAPWAP_FLAG_HDR_F,0);
cw_put_dword(ptr+4, conn->fragid<<16 | fragoffset<<3 ); cw_set_dword(ptr+4, conn->fragid<<16 | fragoffset<<3 );
cw_dbg_pkt(DBG_PKT_OUT,conn,ptr,packetlen,(struct sockaddr*)&conn->addr); cw_dbg_pkt(DBG_PKT_OUT,conn,ptr,packetlen,(struct sockaddr*)&conn->addr);