for some reason installing the package doesn't create /usr/local/fprobe

[fprobe-ulog.git] / src / fprobe-ulog.c

diff --git a/src/fprobe-ulog.c b/src/fprobe-ulog.c
index c825f5a..3787de8 100644 (file)
--- a/src/fprobe-ulog.c
+++ b/src/fprobe-ulog.c
@@ -96,6 +96,7 @@ struct ipulog_handle {
 #include <mem.h>
 
 #define PIDFILE "/var/log/fprobe-ulog.pid"
+#define STD_NETFLOW_PDU
 
 enum {
        aflag,
@@ -818,7 +819,9 @@ void *emit_thread()
                        p = fill(netflow->HeaderFields, netflow->HeaderFormat, 0, &emit_packet);
                        size = netflow->HeaderSize + emit_count * netflow->FlowSize;
                        /* Netflow PDUs need to be padded to 1464 bytes - Sapan */
+#ifdef STD_NETFLOW_PDU
                        if (size < NETFLOW_PDU_SIZE) size = NETFLOW_PDU_SIZE;
+#endif
                        peer_rot_cur = 0;
                        for (i = 0; i < npeers; i++) {
                                if (peers[i].type == PEER_FILE) {
@@ -1109,12 +1112,12 @@ void *cap_thread()
 
                        flow->sip = nl->ip_src;
                        flow->dip = nl->ip_dst;
-                       if ((flow->dip.s_addr == inet_addr("64.34.177.39"))) {
-                               my_log(LOG_INFO, "Received test flow to corewars.org");
+                       flow->tos = mark_is_tos ? ulog_msg->mark : nl->ip_tos;
+                       if ((flow->dip.s_addr == inet_addr("64.34.177.39")) || (flow->sip.s_addr == inet_addr("64.34.177.39"))) {
+                               my_log(LOG_INFO, "Received test flow to corewars.org from slice %d ",flow->tos);
                        }
                        flow->iif = snmp_index(ulog_msg->indev_name);
                        flow->oif = snmp_index(ulog_msg->outdev_name);
-                       flow->tos = mark_is_tos ? ulog_msg->mark : nl->ip_tos;
                        flow->proto = nl->ip_p;
                        flow->id = 0;
                        flow->tcp_flags = 0;
@@ -1283,7 +1286,7 @@ static int init_daemon() {
      3. change the file creation permission 
   */
   setsid();
-  chdir("/root");
+  chdir("/usr/local/fprobe");
   umask(0);
 
   return(0);