summaryrefslogtreecommitdiff
path: root/bgpd/bgp_network.c
diff options
context:
space:
mode:
authorpaul <paul>2004-05-01 08:44:08 +0000
committerpaul <paul>2004-05-01 08:44:08 +0000
commiteb821189d2778a93069fc1fc2f104db529ec5a1e (patch)
treea623d680931ee722fb946f56476f23efd1f13685 /bgpd/bgp_network.c
parenteb3f463aab7f09e6c1041bf779fd5752b038f847 (diff)
2004-05-01 Paul Jakma <paul@dishone.st>
* Revert the attempted clean-up of the dummy peer hack, reverts patchsets 435 (see 2004-02-17 below) and 456.
Diffstat (limited to 'bgpd/bgp_network.c')
-rw-r--r--bgpd/bgp_network.c56
1 files changed, 37 insertions, 19 deletions
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index e03831d0..aa369bc1 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -46,6 +46,7 @@ bgp_accept (struct thread *thread)
int accept_sock;
union sockunion su;
struct peer *peer;
+ struct peer *peer1;
struct bgp *bgp;
char buf[SU_ADDRSTRLEN];
@@ -72,12 +73,12 @@ bgp_accept (struct thread *thread)
zlog_info ("[Event] BGP connection from host %s", inet_sutop (&su, buf));
/* Check remote IP address */
- peer = peer_lookup (bgp, &su);
- if (! peer || peer->status == Idle)
+ peer1 = peer_lookup (bgp, &su);
+ if (! peer1 || peer1->status == Idle)
{
if (BGP_DEBUG (events, EVENTS))
{
- if (! peer)
+ if (! peer1)
zlog_info ("[Event] BGP connection IP address %s is not configured",
inet_sutop (&su, buf));
else
@@ -89,13 +90,30 @@ bgp_accept (struct thread *thread)
}
/* In case of peer is EBGP, we should set TTL for this connection. */
- if (peer_sort (peer) == BGP_PEER_EBGP)
- sockopt_ttl (peer->su.sa.sa_family, bgp_sock, peer->ttl);
+ if (peer_sort (peer1) == BGP_PEER_EBGP)
+ sockopt_ttl (peer1->su.sa.sa_family, bgp_sock, peer1->ttl);
if (! bgp)
- bgp = peer->bgp;
+ bgp = peer1->bgp;
+
+ /* Make dummy peer until read Open packet. */
+ if (BGP_DEBUG (events, EVENTS))
+ zlog_info ("[Event] Make dummy peer structure until read Open packet");
+
+ {
+ char buf[SU_ADDRSTRLEN + 1];
+
+ peer = peer_create_accept (bgp);
+ SET_FLAG (peer->sflags, PEER_STATUS_ACCEPT_PEER);
+ peer->su = su;
+ peer->fd = bgp_sock;
+ peer->status = Active;
+ peer->local_id = peer1->local_id;
- peer->fd_accept = bgp_sock;
+ /* Make peer's address string. */
+ sockunion2str (&su, buf, SU_ADDRSTRLEN);
+ peer->host = strdup (buf);
+ }
BGP_EVENT_ADD (peer, TCP_connection_open);
@@ -115,7 +133,7 @@ bgp_bind (struct peer *peer)
strncpy ((char *)&ifreq.ifr_name, peer->ifname, sizeof (ifreq.ifr_name));
- ret = setsockopt (*peer->fd, SOL_SOCKET, SO_BINDTODEVICE,
+ ret = setsockopt (peer->fd, SOL_SOCKET, SO_BINDTODEVICE,
&ifreq, sizeof (ifreq));
if (ret < 0)
{
@@ -189,12 +207,12 @@ bgp_update_source (struct peer *peer)
if (! addr)
return;
- bgp_bind_address (*peer->fd, addr);
+ bgp_bind_address (peer->fd, addr);
}
/* Source is specified with IP address. */
if (peer->update_source)
- sockunion_bind (*peer->fd, peer->update_source, 0, peer->update_source);
+ sockunion_bind (peer->fd, peer->update_source, 0, peer->update_source);
}
/* BGP try to connect to the peer. */
@@ -204,16 +222,16 @@ bgp_connect (struct peer *peer)
unsigned int ifindex = 0;
/* Make socket for the peer. */
- *peer->fd = sockunion_socket (&peer->su);
- if (*peer->fd < 0)
+ peer->fd = sockunion_socket (&peer->su);
+ if (peer->fd < 0)
return -1;
/* If we can get socket for the peer, adjest TTL and make connection. */
if (peer_sort (peer) == BGP_PEER_EBGP)
- sockopt_ttl (peer->su.sa.sa_family, *peer->fd, peer->ttl);
+ sockopt_ttl (peer->su.sa.sa_family, peer->fd, peer->ttl);
- sockopt_reuseaddr (*peer->fd);
- sockopt_reuseport (*peer->fd);
+ sockopt_reuseaddr (peer->fd);
+ sockopt_reuseport (peer->fd);
/* Bind socket. */
bgp_bind (peer);
@@ -228,10 +246,10 @@ bgp_connect (struct peer *peer)
if (BGP_DEBUG (events, EVENTS))
plog_info (peer->log, "%s [Event] Connect start to %s fd %d",
- peer->host, peer->host, *peer->fd);
+ peer->host, peer->host, peer->fd);
/* Connect to the remote peer. */
- return sockunion_connect (*peer->fd, &peer->su, htons (peer->port), ifindex);
+ return sockunion_connect (peer->fd, &peer->su, htons (peer->port), ifindex);
}
/* After TCP connection is established. Get local address and port. */
@@ -250,8 +268,8 @@ bgp_getsockname (struct peer *peer)
peer->su_remote = NULL;
}
- peer->su_local = sockunion_getsockname (*peer->fd);
- peer->su_remote = sockunion_getpeername (*peer->fd);
+ peer->su_local = sockunion_getsockname (peer->fd);
+ peer->su_remote = sockunion_getpeername (peer->fd);
bgp_nexthop_set (peer->su_local, peer->su_remote, &peer->nexthop, peer);
}