Changeset 496864e

Timestamp:

06/27/06 14:04:09 (15 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:

306f91c

Parents:

e5c2bc4

Message:

Store the port number in the sockaddr in trace_get_{source,destination}_address

File:

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

lib/protocols.c

@@ -602 +602 @@
         uint16_t proto;
         uint32_t remaining;
-        void *transport;
+        void *l3;
+        struct ports_t *ports;
         static struct sockaddr_storage dummy;
 
@@ -610 +611 @@
         remaining = trace_get_capture_length(packet);
 
-        transport = trace_get_payload_from_link(
+        l3 = trace_get_payload_from_link(
                         trace_get_link(packet),
                         trace_get_link_type(packet),
@@ -616 +617 @@
                         &remaining);
 
-        if (!transport)
+        if (!l3)
                 return false;
 
-        transport = trace_get_vlan_payload_from_ethernet_payload(transport,
+        l3 = trace_get_vlan_payload_from_ethernet_payload(l3,
                         &proto,
                         &remaining);
 
-        if (!transport)
-                return false;
+        if (!l3)
+                return NULL;
 
         switch (proto) {
@@ -630 +631 @@
                 {
                         struct sockaddr_in *addr4=(struct sockaddr_in*)addr;
-                        libtrace_ip_t *ip = (libtrace_ip_t*)transport;
+                        libtrace_ip_t *ip = (libtrace_ip_t*)l3;
+                        ports = trace_get_payload_from_ip(ip,NULL,&remaining);
                         addr4->sin_family=AF_INET;
-                        addr4->sin_port=0;
+                        if (ports && remaining>=sizeof(*ports))
+                                addr4->sin_port=ports->src;
+                        else
+                                addr4->sin_port=0;
                         addr4->sin_addr=ip->ip_src;
                         return addr;
@@ -639 +644 @@
                 {
                         struct sockaddr_in6 *addr6=(struct sockaddr_in6*)addr;
-                        libtrace_ip6_t *ip6 = (libtrace_ip6_t*)transport;
+                        libtrace_ip6_t *ip6 = (libtrace_ip6_t*)l3;
+                        ports = trace_get_payload_from_ip6(ip6,NULL,&remaining);
                         addr6->sin6_family=AF_INET6;
-                        addr6->sin6_port=0;
+                        if (ports && remaining>=sizeof(*ports))
+                                addr6->sin6_port=ports->dst;
+                        else
+                                addr6->sin6_port=0;
                         addr6->sin6_flowinfo=0;
                         addr6->sin6_addr=ip6->ip_src;