Fix for upstream quagga: vtysh using #

Change-Id: I358cf88d81ca93509fd905eb6bed69e64facf024
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>

diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/VtyshCli.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/VtyshCli.java
index faef7b4ca5f2d5dfb7ff28f7a536011a322f922f..743c012427702ef8eca9816ed05906896fd54b99 100644 (file)
--- a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/VtyshCli.java
+++ b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/VtyshCli.java
@@ -126,7 +126,7 @@ public class VtyshCli extends OsgiCommandSupport {
         StringBuilder sb = new StringBuilder();
         int ip = 0, ret;
         StringBuilder temp, temp2;
-        char ch, gt = '>';
+        char ch, gt = '>', hashChar = '#';
 
         inputBgpCmd.append("show " + cmd);
 
@@ -187,8 +187,12 @@ public class VtyshCli extends OsgiCommandSupport {
                 socket.close();
                 return;
             }
-            if (ip == (int) gt) {
-                sb.append(gt);
+            if ((ip == (int) gt) || (ip == (int)hashChar)) {
+                if (ip == (int) gt) {
+                    sb.append(gt);
+                } else {
+                    sb.append(hashChar);
+                }
                 break;
             } else if (ip == -1) {
                 System.out.println(sb.toString());
@@ -215,7 +219,7 @@ public class VtyshCli extends OsgiCommandSupport {
                 socket.close();
                 return;
             }
-            if (ip == (int) gt) {
+            if ((ip == (int) gt) || (ip == (int) hashChar)) {
                 break;
             } else if (ip == -1) {
                 System.out.println(sb.toString());

diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/oam/BgpCounters.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/oam/BgpCounters.java
index b14c8fc598eb1b72fc2e86ad6cae03c767d32aee..fe99848ce0d2902c6192ef5c593aed864637e621 100644 (file)
--- a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/oam/BgpCounters.java
+++ b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/oam/BgpCounters.java
@@ -134,7 +134,9 @@ public class BgpCounters extends TimerTask {
                 socket.close();
                 return;
             }
-            if (ret == -1) {
+            if ((ret == (int) gt) || (ret == (int)hash)) {
+                break;
+            } else if (ret == -1) {
                 LOGGER.error("Connection closed by BGPd.");
                 socket.close();
                 return;