Changeset db161c0

Timestamp:

11/27/08 17:44:48 (13 years ago)

Author:

Perry Lorier <perry@…>

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:

c5a35e6

Parents:

1311310

Message:

Start moving to TRACE_IPPROTO

File:

• lib/protocols_transport.c (modified) (5 diffs)

lib/protocols_transport.c

@@ -29 +29 @@
                                 (libtrace_ip_t*)transport, proto, remaining);
                         /* IPv6 */
-                        if (transport && *proto == 41) {
+                        if (transport && *proto == TRACE_IPPROTO_IPV6) {
                                 transport=trace_get_payload_from_ip6(
                                  (libtrace_ip6_t*)transport, proto,remaining);
@@ -52 +52 @@
         tcp=(libtrace_tcp_t*)trace_get_transport(packet,&proto,NULL);
 
-        if (!tcp || proto != 6)
+        if (!tcp || proto != TRACE_IPPROTO_TCP)
                 return NULL;
 
@@ -86 +86 @@
         libtrace_udp_t *udpptr = 0;
 
-        if (ip->ip_p == 17) {
+        if (ip->ip_p == TRACE_IPPROTO_UDP) {
                 udpptr = (libtrace_udp_t *)
                         trace_get_payload_from_ip(ip, NULL, remaining);
@@ -100 +100 @@
         icmp=(libtrace_icmp_t*)trace_get_transport(packet,&proto,NULL);
 
-        if (!icmp || proto != 1)
+        if (!icmp || proto != TRACE_IPPROTO_ICMP)
                 return NULL;
 
@@ -110 +110 @@
         libtrace_icmp_t *icmpptr = 0;
 
-        if (ip->ip_p == 1)  {
+        if (ip->ip_p == TRACE_IPPROTO_ICMP)  {
                 icmpptr = (libtrace_icmp_t *)trace_get_payload_from_ip(ip, 
                                 NULL, remaining);