Merge branch 'master' of github.com:msantos/epcap

c_src/epcap.c

@@ -210,7 +210,6 @@ epcap_loop(EPCAP_STATE *ep)
         switch (pcap_next_ex(p, &hdr, &pkt)) {
             case 0:     /* timeout */
                 VERBOSE(1, "timeout reading packet");
-                epcap_ctrl("timeout");
                 break;
             case 1:     /* got packet */
                 epcap_response(hdr, pkt, datalink);

c_src/epcap.h

@@ -48,7 +48,11 @@
 
 #define SNAPLEN         65535
 #define PROMISC         1       /* true */
-#define TIMEOUT         0       /* ms, 0 = block indefinitely */
+
+/* On Linux, 0 will block until the next packet is received.
+ * On BSD, 0 will block until the snaplen buffer is full.
+ */
+#define TIMEOUT         500     /* ms, 0 = block indefinitely */
 
 #define EPCAP_FILTER    "tcp and port 80"
 

src/epcap.app.src

@@ -0,0 +1,3 @@
+{application, epcap,
+ [{description, "libpcap port"},
+  {vsn, "0.05"}]}.

src/epcap.erl

@@ -1,4 +1,4 @@
-%% Copyright (c) 2009-2010, Michael Santos <michael.santos@gmail.com>
+%% Copyright (c) 2009-2011, Michael Santos <michael.santos@gmail.com>
 %% All rights reserved.
 %%
 %% Redistribution and use in source and binary forms, with or without
@@ -124,6 +124,7 @@ make_args(PL) ->
             user,
             snaplen,
             timeout,
+            verbose,
 
             filter
         ], proplists:lookup(Arg, PL) /= none ],
@@ -138,7 +139,7 @@ get_switch({promiscuous, true}) -> "-P";
 get_switch({snaplen, Arg})      -> "-s " ++ integer_to_list(Arg);
 get_switch({timeout, Arg})      -> "-t " ++ integer_to_list(Arg);
 get_switch({user, Arg})         -> "-u " ++ Arg;
-get_switch({verbose, _Arg})     -> "-v";
+get_switch({verbose, Arg})      -> string:copies("-v ", Arg);
 get_switch({filter, Arg})       -> "\"" ++ Arg ++ "\"".
 
 progname() ->