commit 2a0bc44923917e8cd9af6f78770a76aa3d8ef2bf
author Ubuntu <ubuntu@onos1vpc.(none)> Thu Feb 07 07:42:09 2013 +0000
committer Ubuntu <ubuntu@onos1vpc.(none)> Thu Feb 07 07:42:09 2013 +0000
tree d9dcd176a34053a7929588eed469c898076cc18e
parent 787c3ad277fc706d6e98b8fc6076d7c4f5037bf7
parent 246ff82da897a83f6d143e30c309865d8cf6b107

Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS

Conflicts:
	start-onos.sh

src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java

diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index f5ad9ac..c3ae75a 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -969,7 +969,8 @@
             // continue with the regular processing.
             if (bsn.getPayload() instanceof LLDP == false)
                 return Command.CONTINUE;
-            return handleLldp((LLDP) bsn.getPayload(), sw, pi, false, cntx);
+            //return handleLldp((LLDP) bsn.getPayload(), sw, pi, false, cntx);
+            return Command.STOP;
         } else if (eth.getEtherType() == Ethernet.TYPE_LLDP)  {
             return handleLldp((LLDP) eth.getPayload(), sw, pi, true, cntx);
         } else if (eth.getEtherType() < 1500) {

start-onos.sh

diff --git a/start-onos.sh b/start-onos.sh
index 9f70527..089b1d9 100755
--- a/start-onos.sh
+++ b/start-onos.sh
@@ -79,7 +79,7 @@
   echo "Starting ONOS controller ..."
   echo 
   java ${JVM_OPTS} -Dlogback.configurationFile=${FL_LOGBACK} -jar ${FL_JAR} -cf ./onos.properties > /dev/null 2>&1 &
-  sudo tcpdump -n -i eth0 'tcp port 6633' -s0 -w ${PCAP_LOG} &
+  sudo -b /usr/sbin/tcpdump -n -i eth0 -s0 -w ${PCAP_LOG} 'tcp port 6633' > /dev/null  2>&1
 }
 
 function stop {