-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
nhrpd: Add topotest for retrying resolution request
Modified nhrp_topo topotest to test for newly added resolution request retry feature. Changes to the topotest include adding a spoke to the existing nhrp_topo topotest so that a topology with two spokes and hub can be used to create shortcuts and test the sending/resending of resolution requests and responses between spoke and hub.The resolution request retry feature was tested by blocking incoming resolution requests on a receiving nodes to stop the creation of a successful shortcut - which then triggered the sending spoke to retry sending resolution requests Also modified nhrp_connection_authorized(). Initially, when writing debug informaton about incoming NHRP packets with authentication enabled, the nhrp_connection_authorized() function would print the passphrase of the incoming packet as if it were a null terminated string. This meant that if the passphrase on the incoming packet had non ASCII-complient bytes in it, it would attempt to print those bytes anyway. There was also no check that the size of the passphrase in the incoming packet matched the size of the passphrase on the interface. Moved CISCO_PASS_LENGTH_LEN from nhrp_vty.c to nhrp_protocol.h for easier access to the macro in other files Signed-off-by: Joshua Muthii <jmuthii@labn.net>
- Loading branch information
1 parent
cf1da3e
commit ce91fd8
Showing
14 changed files
with
366 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
{ | ||
"attr":{ | ||
"entriesCount":1 | ||
}, | ||
"table":[ | ||
{ | ||
"type":"dynamic", | ||
"prefix":"192.168.4.0\/24", | ||
"via":"10.255.255.4", | ||
"identity":"" | ||
} | ||
] | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,3 +10,4 @@ exit | |
interface r1-eth1 | ||
ip address 192.168.1.1/24 | ||
! | ||
ip route 0.0.0.0/0 10.255.255.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
{ | ||
"attr":{ | ||
"entriesCount":2 | ||
}, | ||
"table":[ | ||
{ | ||
"interface":"r4-gre0", | ||
"type":"local", | ||
"protocol":"10.255.255.4", | ||
"nbma":"10.1.1.4", | ||
"claimed_nbma":"10.1.1.4", | ||
"used":false, | ||
"timeout":false, | ||
"auth":false, | ||
"identity":"-" | ||
}, | ||
{ | ||
"interface":"r4-gre0", | ||
"type":"nhs", | ||
"protocol":"10.255.255.2", | ||
"nbma":"10.2.1.2", | ||
"claimed_nbma":"10.2.1.2", | ||
"used":false, | ||
"timeout":true, | ||
"auth":false, | ||
"identity":"" | ||
} | ||
] | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"10.255.255.2\/32": [ | ||
{ | ||
"prefix": "10.255.255.2\/32", | ||
"prefixLen": 32, | ||
"protocol": "nhrp", | ||
"vrfId": 0, | ||
"vrfName": "default", | ||
"selected": true, | ||
"destSelected": true, | ||
"distance": 10, | ||
"metric": 0, | ||
"installed": true, | ||
"internalNextHopNum": 1, | ||
"internalNextHopActiveNum": 1, | ||
"nexthops": [ | ||
{ | ||
"fib": true, | ||
"directlyConnected": true, | ||
"interfaceName": "r4-gre0", | ||
"active": true | ||
} | ||
] | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
log stdout debugging | ||
debug nhrp all | ||
interface r4-gre0 | ||
ip nhrp authentication secret | ||
ip nhrp holdtime 10 | ||
ip nhrp shortcut | ||
ip nhrp network-id 42 | ||
ip nhrp nhs dynamic nbma 10.2.1.2 | ||
ip nhrp registration no-unique | ||
tunnel source r4-eth0 | ||
exit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
interface r4-eth0 | ||
ip address 10.1.1.4/24 | ||
! | ||
ip route 10.2.1.0/24 10.1.1.3 | ||
interface r4-gre0 | ||
ip address 10.255.255.4/32 | ||
no link-detect | ||
ipv6 nd suppress-ra | ||
exit | ||
interface r4-eth1 | ||
ip address 192.168.4.4/24 | ||
! | ||
ip route 0.0.0.0/0 10.255.255.2 |
Oops, something went wrong.