Module Name: src
Committed By: kefren
Date: Thu Jul 11 05:55:13 UTC 2013
Modified Files:
src/usr.sbin/ldpd: fsm.c ldp_peer.c ldp_peer.h
Log Message:
Local addresses vector is not needed anymore
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/ldpd/fsm.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/ldpd/ldp_peer.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/ldpd/ldp_peer.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ldpd/fsm.c
diff -u src/usr.sbin/ldpd/fsm.c:1.11 src/usr.sbin/ldpd/fsm.c:1.12
--- src/usr.sbin/ldpd/fsm.c:1.11 Thu Jul 11 05:45:23 2013
+++ src/usr.sbin/ldpd/fsm.c Thu Jul 11 05:55:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fsm.c,v 1.11 2013/07/11 05:45:23 kefren Exp $ */
+/* $NetBSD: fsm.c,v 1.12 2013/07/11 05:55:13 kefren Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -195,7 +195,6 @@ build_address_list_tlv(void)
}
freeifaddrs(ifa);
- add_my_if_addrs(ia, adrcount);
return t;
}
Index: src/usr.sbin/ldpd/ldp_peer.c
diff -u src/usr.sbin/ldpd/ldp_peer.c:1.12 src/usr.sbin/ldpd/ldp_peer.c:1.13
--- src/usr.sbin/ldpd/ldp_peer.c:1.12 Thu Jul 11 05:45:23 2013
+++ src/usr.sbin/ldpd/ldp_peer.c Thu Jul 11 05:55:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_peer.c,v 1.12 2013/07/11 05:45:23 kefren Exp $ */
+/* $NetBSD: ldp_peer.c,v 1.13 2013/07/11 05:55:13 kefren Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -54,13 +54,10 @@
extern int ldp_holddown_time;
-struct in_addr *myaddresses;
-
void
ldp_peer_init(void)
{
SLIST_INIT(&ldp_peer_head);
- myaddresses = NULL;
}
int
@@ -422,19 +419,6 @@ print_bounded_addresses(const struct ldp
warnp("%s\n", abuf);
}
-void
-add_my_if_addrs(struct in_addr * a, int count)
-{
- myaddresses = calloc((count + 1), sizeof(*myaddresses));
-
- if (!myaddresses) {
- fatalp("add_my_if_addrs: malloc problem\n");
- return;
- }
- memcpy(myaddresses, a, count * sizeof(struct in_addr));
- myaddresses[count].s_addr = 0;
-}
-
/* Adds a label and a prefix to a specific peer */
int
ldp_peer_add_mapping(struct ldp_peer * p, const struct sockaddr * a,
Index: src/usr.sbin/ldpd/ldp_peer.h
diff -u src/usr.sbin/ldpd/ldp_peer.h:1.5 src/usr.sbin/ldpd/ldp_peer.h:1.6
--- src/usr.sbin/ldpd/ldp_peer.h:1.5 Thu Jul 11 05:45:23 2013
+++ src/usr.sbin/ldpd/ldp_peer.h Thu Jul 11 05:55:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_peer.h,v 1.5 2013/07/11 05:45:23 kefren Exp $ */
+/* $NetBSD: ldp_peer.h,v 1.6 2013/07/11 05:55:13 kefren Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -103,7 +103,6 @@ struct ldp_peer_address * check_ifaddr(c
void print_bounded_addresses(const struct ldp_peer *);
void del_all_ifaddr(struct ldp_peer *);
int del_ifaddresses(struct ldp_peer *, const struct al_tlv *);
-void add_my_if_addrs(struct in_addr *, int);
int ldp_peer_add_mapping(struct ldp_peer *, const struct sockaddr *, int, int);
int ldp_peer_delete_mapping(struct ldp_peer *, const struct sockaddr *, int);
