[6bone-pl] Re: [mich@newton.zsmeie.torun.pl: BGP i CISCO]

[Rafal Maszkowski]

On Fri, Aug 21, 1998 at 11:57:34AM +0000, Michal Szczesny wrote:
> Ostatnio probujemy (Wojtek, Rafal i ja) puscic BGP4+ w 6bonePL. Zeby to
> troche ulatwic strescilem ciekawsze rzeczy z ksiazki "Zarzadzanie sieciami
> IP za pomoca routerow CISCO" (tj. tylko rozdzial o BGP). Ksiazka wydana
> przez o'Reilly, autor: Scoot M. Ballew.

Mozolność próbowania zwiększają błędy w mrt. Gdyby ktoś przypadkiem zabierał
się też za mrt to do snapshotu 980728 należy dodać:

diff -ru mrt-1.4.8a-980728/src/lib/bgp_proto/bgp_util.c mrt-1.4.8a-980728.masaki+/src/lib/bgp_proto/bgp_util.c
--- mrt-1.4.8a-980728/src/lib/bgp_proto/bgp_util.c	Tue Jul 28 14:08:08 1998
+++ mrt-1.4.8a-980728.masaki+/src/lib/bgp_proto/bgp_util.c	Fri Aug 21 02:13:58 1998
@@ -235,6 +235,13 @@
     if (peer->sockfd < 0)
 	return;
 
+    if (peer->state != BGPSTATE_CONNECT) {
+	trace (TR_WARN, peer->trace,
+	       "connect to %s succeeded but too late\n",
+	       gateway_toa2 (peer->gateway));
+	return;
+    }
+
     if (flag) select_delete_fd2 (peer->sockfd);
 
     /* see if we are really connected */
@@ -273,9 +280,11 @@
 
 
 static void
-bgp_connect_ready2 (bgp_peer_t * peer)
+bgp_schedule_connect_ready (bgp_peer_t * peer)
 {
-    bgp_connect_ready (peer, 1);
+    schedule_event2 ("bgp_connect_ready",
+		     peer->schedule, bgp_connect_ready,
+		     2, peer, 1);
 }
 
 
@@ -406,7 +415,7 @@
 	}
 	trace (TR_PACKET, peer->trace, "waiting on %d for write\n",
 	       peer->sockfd);
-	select_add_fd (peer->sockfd, 2 /* write */, bgp_connect_ready2,
+	select_add_fd (peer->sockfd, 2 /* write */, bgp_schedule_connect_ready,
 		       peer);
 	return (0);
     }
Only in mrt-1.4.8a-980728/src/lib/bgp_proto: bgp_util.c.orig
diff -ru mrt-1.4.8a-980728/src/lib/kernel/linux.c mrt-1.4.8a-980728.masaki+/src/lib/kernel/linux.c
--- mrt-1.4.8a-980728/src/lib/kernel/linux.c	Tue Jul 28 15:32:46 1998
+++ mrt-1.4.8a-980728.masaki+/src/lib/kernel/linux.c	Fri Aug 21 02:17:05 1998
@@ -15,7 +15,6 @@
 #include <net/route.h>
 
 #include <api6.h>
-#ifdef HAVE_IPV6
 #ifdef __GLIBC__
 #include <asm/types.h>
 #include <linux/types.h>
@@ -26,6 +25,7 @@
 /* from linux/socket.h */
 #define MSG_TRUNC       0x20
 
+#ifdef HAVE_IPV6
 /* from linux/ipv6_route.h */
 #define RTF_CACHE       0x01000000      /* cache entry                  */
 #define RTF_FLOW        0x02000000      /* flow significant route       */
@@ -45,10 +45,12 @@
         __u32                   rtmsg_flags;
         int                     rtmsg_ifindex;
 };
-#else
+#endif /* HAVE_IPV6 */
+#else  /* __GLIBC__ */
+#ifdef HAVE_IPV6
 #include <netinet6/ipv6_route.h>
+#endif /* HAVE_IPV6 inside #else __GLIBC__ */
 #endif /* __GLIBC__ */
-#endif /* HAVE_IPV6 */
 
 #include <linux/autoconf.h>
 /* #undef CONFIG_RTNETLINK */
diff -ru mrt-1.4.8a-980728/src/lib/mrt/user.c mrt-1.4.8a-980728.masaki+/src/lib/mrt/user.c
--- mrt-1.4.8a-980728/src/lib/mrt/user.c	Tue Jul 28 14:08:14 1998
+++ mrt-1.4.8a-980728.masaki+/src/lib/mrt/user.c	Fri Aug 21 02:16:52 1998
@@ -192,8 +192,8 @@
       struct timeval  tv;
       fd_set          read_fds;
       int	      ret;
-      /* TIMEOUT of one minute */
-      tv.tv_sec = 300;
+      /* TIMEOUT of one year */
+      tv.tv_sec = 31557600;
       tv.tv_usec = 0;
       FD_ZERO (&read_fds);
       FD_SET (uii_connection->sockfd, &read_fds);
diff -ru mrt-1.4.8a-980728/src/programs/mrtd/config.c mrt-1.4.8a-980728.masaki+/src/programs/mrtd/config.c
--- mrt-1.4.8a-980728/src/programs/mrtd/config.c	Tue Jul 28 14:08:22 1998
+++ mrt-1.4.8a-980728.masaki+/src/programs/mrtd/config.c	Fri Aug 21 02:13:48 1998
@@ -35,7 +35,7 @@
 
 config_mrtd_t *CONFIG_MRTD;
 int BGPSIM = 0;
-int BGPSIM_TRANSPARENT = 1;
+int BGPSIM_TRANSPARENT = 0;
 int running = 0;
 
 /* Comments...

(większość z tego opublikował wczoraj Masaki)

R.