Changeset 5513 for pjproject/branches/projects/uwp/pjlib-util/src/pjlib-util/pcap.c

Timestamp:

Dec 28, 2016 3:40:07 AM (7 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjlib-util/src/pjlib-util/pcap.c (modified) (3 diffs)

pjproject/branches/projects/uwp/pjlib-util/src/pjlib-util/pcap.c

@@ -230 +230 @@
         pj_ssize_t sz;
         pj_size_t sz_read = 0;
+        char addr[PJ_INET_ADDRSTRLEN];
         pj_status_t status;
 
         TRACE_((file->obj_name, "Reading packet.."));
+        pj_bzero(&addr, sizeof(addr));
 
         /* Read PCAP packet header */
@@ -283 +285 @@
         if (file->filter.ip_src && tmp.ip.ip_src != file->filter.ip_src) {
             TRACE_((file->obj_name, "IP source %s mismatch, skipping", 
-                    pj_inet_ntoa(*(pj_in_addr*)&tmp.ip.ip_src)));
+                    pj_inet_ntop2(pj_AF_INET(), (pj_in_addr*)&tmp.ip.ip_src,
+                                  addr, sizeof(addr))));
             SKIP_PKT();
             continue;
@@ -291 +294 @@
         if (file->filter.ip_dst && tmp.ip.ip_dst != file->filter.ip_dst) {
             TRACE_((file->obj_name, "IP detination %s mismatch, skipping", 
-                    pj_inet_ntoa(*(pj_in_addr*)&tmp.ip.ip_dst)));
+                    pj_inet_ntop2(pj_AF_INET(), (pj_in_addr*)&tmp.ip.ip_dst,
+                                  addr, sizeof(addr))));
             SKIP_PKT();
             continue;