Changeset 1769 for pjproject/trunk/pjlib-util/src/pjlib-util/pcap.c

Timestamp:

Feb 2, 2008 9:12:13 AM (16 years ago)

Author:

bennylp

Message:

More ticket #465: option to return UDP header in pj_pcap_read_udp(), and better RTP packet handling in pcaputil sample

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/pcap.c (modified) (4 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/pcap.c

@@ -55 +55 @@
 
 #if 0
+/* gcc insisted on aligning this struct to 32bit on ARM */
 typedef struct pj_pcap_eth_hdr 
 {
     pj_uint8_t  dest[6];
     pj_uint8_t  src[6];
-    pj_uint8_t  len[2]; /* problem with struct size if pj_uint16_t */
+    pj_uint8_t  len[2];
 } pj_pcap_eth_hdr;
 #else
@@ -78 +79 @@
     pj_uint32_t ip_dst;
 } pj_pcap_ip_hdr;
-
-typedef struct pj_pcap_udp_hdr
-{
-    pj_uint16_t src_port;
-    pj_uint16_t dst_port;
-    pj_uint16_t len;
-    pj_uint16_t csum;
-} pj_pcap_udp_hdr;
-
-#pragma pack()
 
 /* Implementation of pcap file */
@@ -211 +202 @@
 /* Read UDP packet */
 PJ_DEF(pj_status_t) pj_pcap_read_udp(pj_pcap_file *file,
+                                     pj_pcap_udp_hdr *udp_hdr,
                                      pj_uint8_t *udp_payload,
                                      pj_size_t *udp_payload_size)
@@ -343 +335 @@
             }
 
+            /* Copy UDP header if caller wants it */
+            if (udp_hdr) {
+                pj_memcpy(udp_hdr, &tmp.udp, sizeof(*udp_hdr));
+            }
+
             /* Calculate payload size */
             sz = pj_ntohs(tmp.udp.len) - sizeof(tmp.udp);