commit a798abbe65cc2cdce050a1aef85c6d243d44a575
author Christian Franke <nobody@nowhere.ws> Thu Aug 11 16:08:05 2016 +0200
committer Paul Jakma <paul.jakma@hpe.com> Tue Oct 04 13:07:55 2016 +0100
tree 6c0fd64d82679ab93e0b653352cd380eef9bd033
parent 5a1a087baebcc4a996de66c558bac49419034ee0

isisd: fix network-type configuration

Reported-by: Martin Winter <mwinter@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

isisd/isis_circuit.c

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 4acd8f3..bbe06b5 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -1357,7 +1357,6 @@
    * is not supported. */
   if (circ_type == CIRCUIT_T_UNKNOWN
       || circ_type == CIRCUIT_T_LOOPBACK
-      || circuit->circ_type == CIRCUIT_T_UNKNOWN
       || circuit->circ_type == CIRCUIT_T_LOOPBACK)
     {
       if (circuit->circ_type != circ_type)

isisd/isis_vty.c

diff --git a/isisd/isis_vty.c b/isisd/isis_vty.c
index 3ce06b8..f9b96a4 100644
--- a/isisd/isis_vty.c
+++ b/isisd/isis_vty.c
@@ -255,7 +255,7 @@
   if (!circuit)
     return CMD_ERR_NO_MATCH;
 
-  if (!isis_circuit_circ_type_set(circuit, CIRCUIT_T_P2P))
+  if (isis_circuit_circ_type_set(circuit, CIRCUIT_T_P2P))
     {
       vty_out (vty, "isis network point-to-point "
                "is valid only on broadcast interfaces%s",
@@ -278,7 +278,7 @@
   if (!circuit)
     return CMD_ERR_NO_MATCH;
 
-  if (!isis_circuit_circ_type_set(circuit, CIRCUIT_T_BROADCAST))
+  if (isis_circuit_circ_type_set(circuit, CIRCUIT_T_BROADCAST))
     {
       vty_out (vty, "isis network point-to-point "
                "is valid only on broadcast interfaces%s",