Changeset 752709f

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

Location:

lib

Files:

• libtrace.h (modified) (1 diff)
• trace.c (modified) (3 diffs)

lib/libtrace.h

@@ -932 +932 @@
 /*@}*/
 
+/** @name Portability
+ * This section has functions that causes annoyances to portability for one
+ * reason or another.
+ * @{
+ */
+
+/** Convert an ethernet address to a string 
+ * @param addr  Ethernet address in network byte order
+ * @param buf   Buffer to store the ascii representation, or NULL
+ * @return buf, or if buf is NULL then a statically allocated buffer.
+ *
+ * This function is similar to the GNU ether_ntoa_r function, with a few
+ * minor differences.  if NULL is passed as buf, then the function will
+ * use an internal static buffer, if NULL isn't passed then the function
+ * will use that buffer instead.
+ *
+ * @note the type of addr isn't struct ether_addr as it is with ether_ntoa_r,
+ * however it is bit compatible so that a cast will work.
+ */ 
+char *trace_ether_ntoa(const uint8_t *addr, char *buf);
+
+/** Convert a string to an ethernet address
+ * @param buf   Ethernet address in hex format delimited with :'s.
+ * @param addr  buffer to store the binary representation, or NULL
+ * @return addr, or if addr is NULL, then a statically allocated buffer.
+ *
+ * This function is similar to the GNU ether_aton_r function, with a few
+ * minor differences.  if NULL is passed as addr, then the function will
+ * use an internal static buffer, if NULL isn't passed then the function will 
+ * use that buffer instead.
+ * 
+ * @note the type of addr isn't struct ether_addr as it is with ether_aton_r,
+ * however it is bit compatible so that a cast will work.
+ */
+uint8_t *trace_ether_aton(const char *buf, uint8_t *addr);
+
+/*@}*/
+
+
 /** Which port is the server port */
 typedef enum {

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;
+}