bugfix for 6667c43df783 "Add warning about malformed ACK vectors"---I'm an idiot

[dccp2tcp] / dccp2tcp.c

diff --git a/dccp2tcp.c b/dccp2tcp.c
index c8cc769d1068397c0810ee30f2688785adf7f9f6..62b0910f7bb65e2beabec1de7109ba0967922449 100644 (file)
--- a/dccp2tcp.c
+++ b/dccp2tcp.c
@@ -534,8 +534,8 @@ unsigned int interp_ack_vect(u_char* hdr)
                                        bp+= (*cur & 0x3F)+1;
                                }
 
-                               if(((*cur& 0xF0)!= 0xC0) && ((*cur& 0xF0)!= 0x00) && ((*cur& 0xF0)!= 0x40)){
-                                       dbgprintf(1, "Warning: Invalid Ack Vector!! (Linux will handle poorly!)\n");
+                               if(((*cur& 0xC0)!= 0xC0) && ((*cur& 0xC0)!= 0x00) && ((*cur& 0xC0)!= 0x40)){
+                                       dbgprintf(1, "Warning: Invalid Ack Vector!! (Linux will handle poorly!) -- %X\n", *cur);
                                }
                                tmp--;
                                cur++;
@@ -585,8 +585,8 @@ u_int32_t add_new_seq(struct host *seq, __be32 num, int size, enum dccp_pkt_type
        }
        
        if(seq->table==NULL){
-               dbgprintf(1, "Warning: Connection initialization incorrect\n");
-               return 0;
+               dbgprintf(1, "Warning: Connection uninitialized\n");
+               return initialize_seq(seq, 0, num);
        }
 
        /*account for missing packets*/
@@ -631,6 +631,11 @@ u_int32_t convert_ack(struct host *seq, __be32 num)
                exit(1);
        }
 
+       if(seq->table==NULL){
+               dbgprintf(1, "Warning: Connection uninitialized\n");
+               initialize_seq(seq, 0, num);
+       }
+
        /*loop through table looking for the DCCP ack number*/
        for(int i=0; i < seq->size; i++){
                if(seq->table[i].old==num){
@@ -651,6 +656,11 @@ int acked_packet_size(struct host *seq, __be32 num)
                exit(1);
        }
 
+       if(seq->table==NULL){
+               dbgprintf(1, "Warning: Connection uninitialized\n");
+               initialize_seq(seq, 0, num);
+       }
+
        /*loop through table looking for the DCCP ack number*/
        for(int i=0; i < seq->size; i++){
                if(seq->table[i].old==num){