X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/60bd25ccdcd9f71e23d64d62dd6273dedc5abbb0..017a7d32fe67b52080826458adf30a6e5f07692f:/bgp.c

diff --git a/bgp.c b/bgp.c
index 0566393..bfcb86e 100644
--- a/bgp.c
+++ b/bgp.c
@@ -1303,7 +1303,7 @@ static int bgp_handle_input(struct bgp_peer *peer)
 	    {
 		LOG(4, 0, 0, "BGP peer %s doesn't support BGP Capabilities\n", peer->name);
 		peer->mp_handling = DoesntHandleIPv6Routes;
-		bgp_restart(peer);
+		bgp_set_retry(peer);
 		return 0;
 	    }
 
@@ -1361,7 +1361,11 @@ static int bgp_send_open(struct bgp_peer *peer)
     data.version = BGP_VERSION;
     data.as = htons(our_as);
     data.hold_time = htons(peer->hold);
-    data.identifier = my_address;
+    /* use the source IP we use as identifier, if available */
+    if (peer->source_addr != INADDR_ANY)
+	data.identifier = peer->source_addr;
+    else
+	data.identifier = my_address;
 
     /* if we know peer doesn't support MP (mp_handling == DoesntHandleIPv6Routes)
        then don't add this parameter */