Changeset 752709f for lib/trace.c

Timestamp:

03/17/06 10:58:25 (16 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:

85a0d42

Parents:

548da5c

Message:

Add libtrace_ether_{n,a}to{a,n}
Fix bug with get seconds

File:

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

lib/trace.c

@@ -613 +613 @@
         }
         free((*packet));
-        packet = NULL;
+        *packet = NULL;
 }       
 
@@ -1180 +1180 @@
 size_t trace_get_capture_length(const libtrace_packet_t *packet) {
 
-        /* Packets can be have a size of zero */
-        assert(packet->size>=0 && packet->size<65536);
+        assert(packet->size<65536);
 
         if (packet->trace->format->get_capture_length) {
@@ -1794 +1793 @@
 }
 
+char *trace_ether_ntoa(const uint8_t *addr, char *buf)
+{
+        char *buf2 = buf;
+        static char staticbuf[17]={0,};
+        if (!buf2)
+                buf2=staticbuf;
+        sprintf(buf2,"%02x:%02x:%02x:%02x:%02x:%02x",
+                        addr[0],addr[1],addr[2],
+                        addr[3],addr[4],addr[5]);
+        return buf2;
+}
+
+uint8_t *trace_ether_aton(const char *buf, uint8_t *addr)
+{
+        uint8_t *buf2 = addr;
+        unsigned int tmp[6];
+        static uint8_t staticaddr[6];
+        if (!buf2)
+                buf2=staticaddr;
+        sscanf(buf,"%x:%x:%x:%x:%x:%x",
+                        &tmp[0],&tmp[1],&tmp[2],
+                        &tmp[3],&tmp[4],&tmp[5]);
+        buf2[0]=tmp[0]; buf2[1]=tmp[1]; buf2[2]=tmp[2];
+        buf2[3]=tmp[3]; buf2[4]=tmp[4]; buf2[5]=tmp[5];
+        return buf2;
+}