bug fixes

elements/local/fromnmdevice.cc

@@ -15,6 +15,7 @@
 #include <click/userutils.hh>
 #include <unistd.h>
 #include <fcntl.h>
+#include <click/master.hh>
 
 # include <sys/socket.h>
 # include <net/if.h>
@@ -35,7 +36,7 @@ CLICK_DECLS
 FromNMDevice::FromNMDevice()
     :
       _task(this),
-      _datalink(-1), _count(0), _promisc(0), _snaplen(0)
+      _count(0), _promisc(0), _snaplen(0)
 {
     _fd = -1;
     _ringid = -1;
@@ -107,7 +108,6 @@ FromNMDevice::initialize(ErrorHandler *errh)
     else
 	_fd = _netmap.open(_ifname, true, errh);
     if (_fd >= 0) {
-	_datalink = FAKE_DLT_EN10MB;
 	_netmap.initialize_rings_rx(0);//_timestamp);
     }
 

elements/local/fromnmdevice.hh

@@ -1,5 +1,5 @@
-#ifndef CLICK_FROMDEVICE_USERLEVEL_HH
-#define CLICK_FROMDEVICE_USERLEVEL_HH
+#ifndef CLICK_FROMNMDEVICE_HH
+#define CLICK_FROMNMDEVICE_HH
 #include <click/element.hh>
 #include "elements/userlevel/kernelfilter.hh"
 #include "elements/userlevel/netmapinfo.hh"
@@ -13,16 +13,12 @@ class FromNMDevice : public Element { public:
     FromNMDevice();
     ~FromNMDevice();
 
-    const char *class_name() const
-	{ return "FromNMDevice"; }
-    const char *port_count() const
-	{ return "0/1-2"; }
-    const char *processing() const
-	{ return PUSH; }
+    const char *class_name() const	{ return "FromNMDevice"; }
+    const char *port_count() const	{ return "0/1-2"; }
+    const char *processing() const	{ return PUSH; }
 
     enum { default_snaplen = 2046 };
-    int configure_phase() const
-	{ return KernelFilter::CONFIGURE_PHASE_FROMDEVICE; }
+    int configure_phase() const 	{ return KernelFilter::CONFIGURE_PHASE_FROMDEVICE; }
     int configure(Vector<String> &, ErrorHandler *);
     int initialize(ErrorHandler *);
     void cleanup(CleanupStage);
@@ -36,7 +32,7 @@ class FromNMDevice : public Element { public:
     void selected(int fd, int mask);
 
     const NetmapInfo::ring *netmap() const
-	{ return _netmap; }
+	{ return &_netmap; }
     inline int dev_ringid() { return _ringid; }
 
     bool run_task(Task *task);

elements/local/tonmdevice.cc

@@ -9,6 +9,7 @@
 #include <click/straccum.hh>
 #include <stdio.h>
 #include <unistd.h>
+#include <click/master.hh>
 
 # include <sys/socket.h>
 # include <sys/ioctl.h>
@@ -55,7 +56,7 @@ ToNMDevice::configure(Vector<String> &conf, ErrorHandler *errh)
     if (_burst <= 0)
 	return errh->error("bad BURST");
 
-    NetmapInfo::set_dev_dirs(_ifname.c_str(), NetmapInfo::dev_tx);
+    NetmapInfo::set_dev_dir(_ifname.c_str(), NetmapInfo::dev_tx);
     return 0;
 }
 

elements/local/tonmdevice.hh

@@ -1,5 +1,5 @@
-#ifndef CLICK_TODEVICE_USERLEVEL_HH
-#define CLICK_TODEVICE_USERLEVEL_HH
+#ifndef CLICK_TONMDEVICE_HH
+#define CLICK_TONMDEVICE_HH
 #include <click/element.hh>
 #include <click/string.hh>
 #include <click/task.hh>
@@ -14,17 +14,12 @@ class ToNMDevice : public Element { public:
     ToNMDevice();
     ~ToNMDevice();
 
-    const char *class_name() const
-	{ return "ToNMDevice"; }
-    const char *port_count() const
-	{ return "1/0-2"; }
-    const char *processing() const
-	{ return "l/h"; }
-    const char *flags() const
-	{ return "S2"; }
+    const char *class_name() const	{ return "ToNMDevice"; }
+    const char *port_count() const	{ return "1/0-2"; }
+    const char *processing() const	{ return "l/h"; }
+    const char *flags() const	{ return "S2"; }
 
-    int configure_phase() const
-	{ return KernelFilter::CONFIGURE_PHASE_TODEVICE; }
+    int configure_phase() const 	{ return KernelFilter::CONFIGURE_PHASE_TODEVICE; }
     int configure(Vector<String> &, ErrorHandler *);
     int initialize(ErrorHandler *);
     void cleanup(CleanupStage);

elements/userlevel/fromdevice.cc

@@ -61,6 +61,7 @@
 
 #if FROMDEVICE_ALLOW_NETMAP
 # include <sys/mman.h>
+#include <click/master.hh>
 #endif
 
 CLICK_DECLS
@@ -165,9 +166,9 @@ FromDevice::configure(Vector<String> &conf, ErrorHandler *errh)
 	return errh->error("bad METHOD");
 
 #if FROMDEVICE_ALLOW_NETMAP
-    if (_method == method_deafult || _method = method_netmap) {
+    if (_method == method_default || _method == method_netmap) {
 	NetmapInfo::register_buf_consumer();
-	NetmapInfo::set_dev_dirs(_ifname.c_str(), NetmapInfo::dev_rx);
+	NetmapInfo::set_dev_dir(_ifname.c_str(), NetmapInfo::dev_rx);
     }
 #endif
 

elements/userlevel/netmapinfo.cc

@@ -52,7 +52,7 @@ NetmapInfo::initialize(int nthreads, ErrorHandler *errh)
     if (!initialized) {
 	nr_threads = nthreads;
 
-	if (nr_threads == 1 || nr_buf_consumers = 1)
+	if (nr_threads == 1 || nr_buf_consumers == 1)
 	    need_consumer_locking = false;
 	else
 	    need_consumer_locking = true;

elements/userlevel/netmapinfo.hh

@@ -7,6 +7,7 @@
 #include <click/packet.hh>
 #include <click/error.hh>
 #include <click/sync.hh>
+#include <g4c.h>
 #include <click/ring.hh>
 #include <click/glue.hh>
 #include <map>

elements/userlevel/todevice.cc

@@ -56,6 +56,7 @@
 #endif
 #if TODEVICE_ALLOW_NETMAP
 # include <sys/mman.h>
+# include <click/master.hh>
 #endif
 
 CLICK_DECLS
@@ -134,8 +135,8 @@ ToDevice::configure(Vector<String> &conf, ErrorHandler *errh)
 	return errh->error("bad METHOD");
 
 #if FROMDEVICE_ALLOW_NETMAP
-    if (_method == method_deafult || _method = method_netmap) {
-	NetmapInfo::set_dev_dirs(_ifname.c_str(), NetmapInfo::dev_tx);
+    if (_method == method_default || _method == method_netmap) {
+	NetmapInfo::set_dev_dir(_ifname.c_str(), NetmapInfo::dev_tx);
     }
 #endif
 

hvpconfigure

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 ./configure --prefix=$1 --enable-user-multithread --disable-linuxmodule --enable-local \
---enable-ipsec --enable-etherswitch --with-netmap --enable-nanotimestamp --enable-select=poll
+--enable-ipsec --enable-etherswitch --with-netmap --enable-multithread  --enable-select=poll