ongrep

commit a3e14d9f0346842efd78de93b1bddfe5b7dbe35f
parent 2d642131e7afd492034c14597c253fcd273e4693
Author: Jordan Ritter <jpr5@darkridge.com>
Date:   Sun, 20 Feb 2005 03:59:38 +0000

last set of %d->%u changes I think, and condense 2 drop_privs() to 1

Diffstat:
M
ngrep.c
 | 
16
++++++----------

1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/ngrep.c b/ngrep.c
@@ -284,10 +284,6 @@ int main(int argc, char **argv) {
             clean_exit(-1);
         }
 
-#if !defined(_WIN32)
-        drop_privs();
-#endif
-
         live_read = 0;
         printf("input: %s\n", read_file);
 
@@ -305,10 +301,6 @@ int main(int argc, char **argv) {
             clean_exit(-1);
         }
 
-#if !defined(_WIN32)
-        drop_privs();
-#endif
-
         if (pcap_lookupnet(dev, &net.s_addr, &mask.s_addr, pc_err) == -1) {
             perror(pc_err);
             memset(&net, 0, sizeof(net));
@@ -325,6 +317,10 @@ int main(int argc, char **argv) {
         }
     }
 
+#if !defined(_WIN32)
+    drop_privs();
+#endif
+
     if (filter_file) {
         char buf[1024] = {0};
         FILE *f = fopen(filter_file, "r");
@@ -1024,7 +1020,7 @@ int strishex(char *str) {
 void print_time_absolute(struct pcap_pkthdr *h) {
     struct tm *t = localtime((const time_t *)&h->ts.tv_sec);
 
-    printf("%02d/%02d/%02d %02d:%02d:%02d.%06d ",
+    printf("%02u/%02u/%02u %02u:%02u:%02u.%06u ",
            t->tm_year+1900, t->tm_mon+1, t->tm_mday, t->tm_hour,
            t->tm_min, t->tm_sec, h->ts.tv_usec);
 }
@@ -1040,7 +1036,7 @@ void print_time_diff(struct pcap_pkthdr *h) {
         usecs = 1000000 - (prev_ts.tv_usec - h->ts.tv_usec);
     }
 
-    printf("+%u.%06d ", secs, usecs);
+    printf("+%u.%06u ", secs, usecs);
 
     prev_ts.tv_sec = h->ts.tv_sec;
     prev_ts.tv_usec = h->ts.tv_usec;