Changeset 58e9e02 for lib/trace.c

Timestamp:

04/28/05 15:22:40 (17 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:

a6badc2

Parents:

48cfaed

Message:

Added trace_get_{source,destination}_port
Added an API version #define
Consitification fixes

File:

• lib/trace.c (modified) (9 diffs)

lib/trace.c

@@ -925 +925 @@
  * @returns a pointer to the IP header, or NULL if there is not an IP packet
  */
-struct libtrace_ip *trace_get_ip(struct libtrace_packet_t *packet) {
+struct libtrace_ip *trace_get_ip(const struct libtrace_packet_t *packet) {
         struct libtrace_ip *ipptr = 0;
 
@@ -1019 +1019 @@
  * @returns a pointer to the TCP header, or NULL if there is not a TCP packet
  */
-struct libtrace_tcp *trace_get_tcp(struct libtrace_packet_t *packet) {
+struct libtrace_tcp *trace_get_tcp(const struct libtrace_packet_t *packet) {
         struct libtrace_tcp *tcpptr = 0;
         struct libtrace_ip *ipptr = 0;
@@ -1040 +1040 @@
  * Skipped can be NULL, in which case it will be ignored by the program.
  */
-struct libtrace_tcp *get_tcp_from_ip(struct libtrace_ip *ip, int *skipped)
+struct libtrace_tcp *get_tcp_from_ip(const struct libtrace_ip *ip, int *skipped)
 {
 #define SW_IP_OFFMASK 0xff1f
@@ -1060 +1060 @@
  * @returns a pointer to the UDP header, or NULL if this is not a UDP packet
  */
-struct libtrace_udp *trace_get_udp(struct libtrace_packet_t *packet) {
+struct libtrace_udp *trace_get_udp(const struct libtrace_packet_t *packet) {
         struct libtrace_udp *udpptr = 0;
         struct libtrace_ip *ipptr = 0;
@@ -1082 +1082 @@
  * Skipped can be NULL, in which case it will be ignored by the program.
  */
-struct libtrace_udp *get_udp_from_ip(struct libtrace_ip *ip, int *skipped)
+struct libtrace_udp *get_udp_from_ip(const struct libtrace_ip *ip, int *skipped)
 {
         struct libtrace_udp *udpptr = 0;
@@ -1102 +1102 @@
  * @returns a pointer to the ICMP header, or NULL if this is not a ICMP packet
  */
-struct libtrace_icmp *trace_get_icmp(struct libtrace_packet_t *packet) {
+struct libtrace_icmp *trace_get_icmp(const struct libtrace_packet_t *packet) {
         struct libtrace_icmp *icmpptr = 0;
         struct libtrace_ip *ipptr = 0;
@@ -1621 +1621 @@
  */
 int trace_bpf_filter(struct libtrace_filter_t *filter,
-                        struct libtrace_packet_t *packet) {
+                        const struct libtrace_packet_t *packet) {
 #if HAVE_BPF
         void *linkptr = 0;
@@ -1765 +1765 @@
 }
 
+struct ports_t {
+        uint16_t src;
+        uint16_t dst;
+};
+
+/* Return the client port
+ */
+uint16_t trace_get_source_port(const struct libtrace_packet_t *packet)
+{
+        struct libtrace_ip *ip = trace_get_ip(packet);
+        if (6 != ip->ip_p
+          && 17 != ip->ip_p)
+                return 0;
+        if (0 != (ip->ip_off & SW_IP_OFFMASK))
+                return 0;
+
+        struct ports_t *port;
+        port = (struct ports_t *)((ptrdiff_t)ip + (ip->ip_hl * 4));
+
+        return htons(port->src);
+}
+
+/* Same as get_source_port except use the destination port */
+uint16_t trace_get_destination_port(const struct libtrace_packet_t *packet)
+{
+        struct libtrace_ip *ip = trace_get_ip(packet);
+
+        if (6 != ip->ip_p
+          && 17 != ip->ip_p)
+                return 0;
+
+        if (0 != (ip->ip_off & SW_IP_OFFMASK))
+                return 0;
+
+        struct ports_t *port;
+        port = (struct ports_t *)((ptrdiff_t)ip + (ip->ip_hl * 4));
+
+        return htons(port->dst);
+}
+
 #define ROOT_SERVER(x) ((x) < 512)
 #define ROOT_CLIENT(x) ((512 <= (x)) && ((x) < 1024))
@@ -1772 +1812 @@
 #define SERVER(x) ROOT_SERVER(x) || NONROOT_SERVER(x)
 #define CLIENT(x) ROOT_CLIENT(x) || NONROOT_CLIENT(x) 
-
 
 /* Attempt to deduce the 'server' port