summaryrefslogtreecommitdiffstats
path: root/pimd/pim_msdp_socket.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-05-22 15:12:08 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-07-24 19:51:37 +0200
commit2ad78035cc824f747e64274020140dcd0b95e3fd (patch)
treefec2b9db86a4148e97cfd72d296febe633b073c7 /pimd/pim_msdp_socket.c
parentpimd: Get the default pim code ready to write into vrf's or not (diff)
downloadfrr-2ad78035cc824f747e64274020140dcd0b95e3fd.tar.xz
frr-2ad78035cc824f747e64274020140dcd0b95e3fd.zip
pimd: Make pim MSDP pim instance aware to some extent
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_msdp_socket.c')
-rw-r--r--pimd/pim_msdp_socket.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/pimd/pim_msdp_socket.c b/pimd/pim_msdp_socket.c
index 0ce097101..9b955d47c 100644
--- a/pimd/pim_msdp_socket.c
+++ b/pimd/pim_msdp_socket.c
@@ -85,7 +85,7 @@ static int pim_msdp_sock_accept(struct thread *thread)
/* see if have peer config for this */
mp = pim_msdp_peer_find(su.sin.sin_addr);
if (!mp || !PIM_MSDP_PEER_IS_LISTENER(mp)) {
- ++msdp->rejected_accepts;
+ ++pimg->msdp.rejected_accepts;
if (PIM_DEBUG_MSDP_EVENTS) {
zlog_err("msdp peer connection refused from %s",
sockunion2str(&su, buf, SU_ADDRSTRLEN));
@@ -123,9 +123,9 @@ int pim_msdp_sock_listen(void)
int socklen;
struct sockaddr_in sin;
int rc;
- struct pim_msdp_listener *listener = &msdp->listener;
+ struct pim_msdp_listener *listener = &pimg->msdp.listener;
- if (msdp->flags & PIM_MSDPF_LISTENER) {
+ if (pimg->msdp.flags & PIM_MSDPF_LISTENER) {
/* listener already setup */
return 0;
}
@@ -178,10 +178,10 @@ int pim_msdp_sock_listen(void)
listener->fd = sock;
memcpy(&listener->su, &sin, socklen);
listener->thread = NULL;
- thread_add_read(msdp->master, pim_msdp_sock_accept, listener, sock,
+ thread_add_read(pimg->msdp.master, pim_msdp_sock_accept, listener, sock,
&listener->thread);
- msdp->flags |= PIM_MSDPF_LISTENER;
+ pimg->msdp.flags |= PIM_MSDPF_LISTENER;
return 0;
}