Merge remote-tracking branch 'origin/master' into testing

albert-lopez · albert-lopez · commit 2b0c0b6a5a9e · 2019-04-11T15:59:55.000+02:00
diff --git a/oor/control/lisp_xtr.c b/oor/control/lisp_xtr.c
@@ -1034,7 +1034,7 @@ xtr_recv_info_nat(lisp_xtr_t *xtr, lbuf_t *buf, uconn_t *uc)
 
     /* SMR proxy-ITRs list to be updated with new mappings */
     if (smr_required){
-        OOR_LOG(LDBG_1,"Selected RTR list has changed. Programing SMR");
+        OOR_LOG(LDBG_1,"Selected RTR list has changed. Programming SMR");
         xtr_program_smr(xtr, 1);
     }
 
diff --git a/oor/liblisp/lisp_address.c b/oor/liblisp/lisp_address.c
@@ -809,7 +809,7 @@ lisp_addr_get_ip_pref_addr(lisp_addr_t *addr)
 {
     switch (lisp_addr_lafi(addr)) {
     case LM_AFI_IP:
-        OOR_LOG(LDBG_3, "lisp_addr_get_ip_pref_addr: Not applicable to ip addressess");
+        OOR_LOG(LDBG_3, "lisp_addr_get_ip_pref_addr: Not applicable to ip addresses");
         return (NULL);
     case LM_AFI_IPPREF:
         return (addr);

Original file line number	Diff line number	Diff line change
`@@ -1034,7 +1034,7 @@ xtr_recv_info_nat(lisp_xtr_t xtr, lbuf_t buf, uconn_t *uc)`
`1034`	`1034`
`1035`	`1035`	`/* SMR proxy-ITRs list to be updated with new mappings */`
`1036`	`1036`	`if (smr_required){`
`1037`		`- OOR_LOG(LDBG_1,"Selected RTR list has changed. Programing SMR");`
	`1037`	`+ OOR_LOG(LDBG_1,"Selected RTR list has changed. Programming SMR");`
`1038`	`1038`	`xtr_program_smr(xtr, 1);`
`1039`	`1039`	`}`
`1040`	`1040`
Original file line number	Diff line number	Diff line change
`@@ -809,7 +809,7 @@ lisp_addr_get_ip_pref_addr(lisp_addr_t *addr)`
`809`	`809`	`{`
`810`	`810`	`switch (lisp_addr_lafi(addr)) {`
`811`	`811`	`case LM_AFI_IP:`
`812`		`- OOR_LOG(LDBG_3, "lisp_addr_get_ip_pref_addr: Not applicable to ip addressess");`
	`812`	`+ OOR_LOG(LDBG_3, "lisp_addr_get_ip_pref_addr: Not applicable to ip addresses");`
`813`	`813`	`return (NULL);`
`814`	`814`	`case LM_AFI_IPPREF:`
`815`	`815`	`return (addr);`