Changeset 6b6ede6

Timestamp:

04/03/07 14:20:06 (14 years ago)

Author:

Scott Raynel <smr26@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

f83e07e

Parents:

33dff53

Message:

Use libtrace's trace_get_next_option() function instead of
implementing it again (with bugs).

File:

• libpacketdump/ip_6.c (modified) (2 diffs)

libpacketdump/ip_6.c

@@ -19 +19 @@
 #define DISPLAYL(x,fmt) DISPLAY_EXP(x,fmt,htonl(tcp->x))
 #define DISPLAYIP(x,fmt) DISPLAY_EXP(x,fmt,inet_ntoa(*(struct in_addr*)&tcp->x))
-
-int get_next_option(unsigned char **ptr,int *len,
-                        unsigned char *type,
-                        unsigned char *optlen,
-                        unsigned char **data)
-{
-        if (*len<=0)
-                return 0;
-        *type=**ptr;
-        switch(*type) {
-                case 0:
-                        return 0;
-                case 1:
-                        (*ptr)++;
-                        (*len)--;
-                        return 1;
-                default:
-                        *optlen = *(*ptr+1);
-                        (*len)-=*optlen;
-                        (*data)=(*ptr+2);
-                        (*ptr)+=*optlen;        /* Not optlen + 2! */
-                        if (*len<0)
-                                return 0;
-                        return 1;
-        }
-}
 
 void decode(int link_type,char *packet,int len)
@@ -98 +72 @@
         int plen = (len-sizeof *tcp) < (tcp->doff*4-sizeof(*tcp))?(len-sizeof(*tcp)):(tcp->doff*4-sizeof *tcp);
         unsigned char type,optlen,*data;
-        while(get_next_option(&pkt,&plen,&type,&optlen,&data)) {
+        while(trace_get_next_option(&pkt,&plen,&type,&optlen,&data)) {
                 printf("\n TCP: ");
                 switch(type) {