Digging deepter into VM concepts...
FossilOrigin-Name: ba6454642f17c0f87106cb6af12689457433d44ba1fe2dd1ef920dba7be2ef27
This commit is contained in:
@ -74,31 +74,38 @@ static int cwrmsg_init_ctrlhdr(struct conn * conn, struct cwrmsg * cwrmsg, uint8
|
||||
}
|
||||
|
||||
|
||||
static int process_message(struct conn * conn,struct cwrmsg *cwrmsg,int (*cb)(void*,struct cwrmsg *),void *cbarg)
|
||||
static int process_message(struct conn * conn,uint8_t *rawmsg,int rawlen,int (*cb)(void*,uint8_t *,int),void *cbarg)
|
||||
{
|
||||
if (!(cwrmsg->type & 0x1)) {
|
||||
uint8_t *msgptr = rawmsg+cw_get_hdr_msg_offset(rawmsg);
|
||||
|
||||
|
||||
uint32_t type = cw_get_msg_type(msgptr);
|
||||
|
||||
if (!(type & 0x1)) {
|
||||
/* It's a response message, no further examination required. */
|
||||
cb(cbarg,cwrmsg);
|
||||
cb(cbarg,rawmsg,rawlen);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* It's a request message, check if seqnum is right and if
|
||||
* we have already sent a response message*/
|
||||
|
||||
uint8_t seqnum = cw_get_msg_seqnum(msgptr);
|
||||
|
||||
int s1=conn->last_seqnum_received;
|
||||
int s2=cwrmsg->seqnum;
|
||||
int s2=seqnum;
|
||||
int sd=s2-s1;
|
||||
|
||||
if ((sd>0 && sd<128) || (sd<0 && sd<-128) || s1<0){
|
||||
/* seqnum is ok, normal message processing */
|
||||
conn->last_seqnum_received=cwrmsg->seqnum;
|
||||
cb(cbarg,cwrmsg);
|
||||
conn->last_seqnum_received=seqnum;
|
||||
cb(cbarg,rawmsg,rawlen);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (sd != 0)
|
||||
{
|
||||
cw_dbg(DBG_CW_MSG_ERR,
|
||||
cw_dbg(DBG_MSG_ERR,
|
||||
"Discarding message from %s, old seqnum, seqnum = %d, last seqnum=%d",
|
||||
sock_addr2str(&conn->addr),s2,s1);
|
||||
|
||||
@ -108,15 +115,15 @@ static int process_message(struct conn * conn,struct cwrmsg *cwrmsg,int (*cb)(vo
|
||||
/* the received request message was retransmitte by our peer,
|
||||
* let's retransmit our response message if we have one*/
|
||||
|
||||
cw_dbg(DBG_CW_MSG_ERR,"Retransmitted request message from %s detected, seqnum=%d, type=%d",
|
||||
sock_addr2str(&conn->addr),s2,cwrmsg->type);
|
||||
cw_dbg(DBG_MSG_ERR,"Retransmitted request message from %s detected, seqnum=%d, type=%d",
|
||||
sock_addr2str(&conn->addr),s2,type);
|
||||
|
||||
if (conn->resp_msg.type-1 != cwrmsg->type ){
|
||||
cw_dbg(DBG_CW_MSG_ERR,"No cached response for retransmission, request seqnum=%d,in cache=%d",s2,conn->resp_msg.type );
|
||||
if (conn->resp_msg.type-1 != type ){
|
||||
cw_dbg(DBG_MSG_ERR,"No cached response for retransmission, request seqnum=%d,in cache=%d",s2,conn->resp_msg.type );
|
||||
return 0;
|
||||
}
|
||||
|
||||
cw_dbg(DBG_CW_MSG_ERR,"Retransmitting response message to %s, seqnum=%d",
|
||||
cw_dbg(DBG_MSG_ERR,"Retransmitting response message to %s, seqnum=%d",
|
||||
sock_addr2str(&conn->addr),s2);
|
||||
conn_send_cwmsg(conn,&conn->resp_msg);
|
||||
return 1;
|
||||
@ -154,72 +161,68 @@ static void cw_dbg_packet(struct conn * conn, uint8_t * packet, int len)
|
||||
#endif
|
||||
|
||||
|
||||
void conn_process_packet(struct conn * conn, uint8_t *packet, int len,int (*cb)(void*,struct cwrmsg*),void *cbarg)
|
||||
void conn_process_packet(struct conn * conn, uint8_t *packet, int len,int (*cb)(void*,uint8_t *,int),void *cbarg)
|
||||
{
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (len<8){
|
||||
/* packet too short */
|
||||
cw_dbg(DBG_CW_PKT_ERR,"Discarding packet from %s, packet too short, len=%d",sock_addr2str(&conn->addr),len);
|
||||
return;
|
||||
}
|
||||
|
||||
uint32_t val = ntohl(*((uint32_t*)packet));
|
||||
int preamble = cw_get_hdr_preamble(packet);
|
||||
|
||||
int preamble = val >> 24;
|
||||
if ( (preamble & 0xf0) != CW_VERSION){
|
||||
/* wrong version */
|
||||
cw_dbg(DBG_CW_PKT_ERR,"Discarding packet from %s, wrong version, version=%d",sock_addr2str(&conn->addr),(preamble&0xf0)>>8);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (preamble & 0xf ) {
|
||||
/* decode dtls */
|
||||
return;
|
||||
}
|
||||
|
||||
/* log this packet */
|
||||
cw_dbg_packet(conn,packet,len);
|
||||
|
||||
|
||||
int hlen = 4*((val >> 19) & 0x1f);
|
||||
int offs = cw_get_hdr_msg_offset(packet);
|
||||
|
||||
|
||||
int payloadlen = len - hlen;
|
||||
int payloadlen = len - offs;
|
||||
if (payloadlen<0){
|
||||
cw_dbg(DBG_CW_PKT_ERR,"Discarding packet from %s, hlen greater than len, hlen=%d",sock_addr2str(&conn->addr),hlen);
|
||||
cw_dbg(DBG_CW_PKT_ERR,"Discarding packet from %s, header length greater than len, hlen=%d",sock_addr2str(&conn->addr),offs);
|
||||
/* EINVAL */
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
struct cwrmsg cwrmsg;
|
||||
cwrmsg.wbid=(val>>9) & 0x1f;
|
||||
cwrmsg.rid=(val>>14) & 0x1f;
|
||||
*/
|
||||
|
||||
printf ("Offs is %d RML is %d\n",offs,cw_get_hdr_rmac_len(packet));
|
||||
|
||||
|
||||
if (val & CWTH_FLAGS_M){
|
||||
/* Check Radio MAC if preset */
|
||||
if (cw_get_hdr_flag_m(packet)){
|
||||
|
||||
if (*(packet+8)+8>hlen){
|
||||
if (cw_get_hdr_rmac_len(packet)+8>offs){
|
||||
/* wrong rmac size */
|
||||
cw_dbg(DBG_CW_PKT_ERR,"Discarding packet, wrong rmac size, size=%d",*(packet+8));
|
||||
cw_dbg(DBG_CW_PKT_ERR,"Discarding packet, wrong R-MAC size, size=%d",*(packet+8));
|
||||
return;
|
||||
}
|
||||
memcpy(cwrmsg.rmac, packet+8,8);
|
||||
}
|
||||
else{
|
||||
cwrmsg.rmac[0]=0;
|
||||
// memcpy(cwrmsg.rmac, packet+8,8);
|
||||
}
|
||||
// else{
|
||||
// cwrmsg.rmac[0]=0;
|
||||
// }
|
||||
|
||||
|
||||
if (val & CWTH_FLAGS_F){ /* fragmented */
|
||||
if (cw_get_hdr_flag_f(packet)){ /* fragmented */
|
||||
uint8_t * f;
|
||||
f = fragman_add(conn->fragman, packet,hlen,payloadlen);
|
||||
f = fragman_add(conn->fragman, packet,offs,payloadlen);
|
||||
if (f==NULL)
|
||||
return;
|
||||
|
||||
@ -229,12 +232,17 @@ void conn_process_packet(struct conn * conn, uint8_t *packet, int len,int (*cb)(
|
||||
extern int cw_process_msg(struct conn * conn,uint8_t*msg,int len);
|
||||
cw_process_msg(conn,f+4,*(uint32_t*)f);
|
||||
|
||||
printf("Received a fragmented packetm should process it");
|
||||
exit(0);
|
||||
|
||||
/*
|
||||
if (!cwrmsg_init_ctrlhdr(conn,&cwrmsg,f+4,*(uint32_t*)f)){
|
||||
free(f);
|
||||
return;
|
||||
};
|
||||
process_message(conn,&cwrmsg,cb,cbarg);
|
||||
*/
|
||||
process_message(conn,f+4,*(uint32_t*)f,cb,cbarg);
|
||||
|
||||
free (f);
|
||||
return;
|
||||
}
|
||||
@ -243,13 +251,14 @@ extern int cw_process_msg(struct conn * conn,uint8_t*msg,int len);
|
||||
cw_process_msg(conn,packet,len);
|
||||
|
||||
|
||||
if (!cwrmsg_init_ctrlhdr(conn,&cwrmsg,packet+hlen,len-hlen) ){
|
||||
//if (!cwrmsg_init_ctrlhdr(conn,&cwrmsg,packet+hlen,len-hlen) ){
|
||||
// cw_dbg(DBG_CW_PKT_ERR,"Discarding packet from %s, len=%d (too short)",sock_addr2str(&conn->addr));
|
||||
return;
|
||||
}
|
||||
// return;
|
||||
//}
|
||||
|
||||
|
||||
process_message(conn,&cwrmsg,cb,cbarg);
|
||||
printf("Next big thing\n");
|
||||
//msg_4*((val >> 19) & 0x1f);
|
||||
process_message(conn,packet,len,cb,cbarg);
|
||||
return;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user