Fri Dec 31 11:29:34 2010 UTC ()

show in neighbour information if peer is MD5 authenticated


(kefren)

diff -r1.3 -r1.4 src/usr.sbin/ldpd/ldp_command.c

--- src/usr.sbin/ldpd/ldp_command.c 2010/12/30 11:29:21	1.3
+++ src/usr.sbin/ldpd/ldp_command.c 2010/12/31 11:29:33	1.4

 @@ -1,14 +1,14 @@
-/* $NetBSD: ldp_command.c,v 1.3 2010/12/30 11:29:21 kefren Exp $ */
+/* $NetBSD: ldp_command.c,v 1.4 2010/12/31 11:29:33 kefren Exp $ */
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Mihai Chelaru <kefren@NetBSD.org>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -22,26 +22,27 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
 #include <errno.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "label.h"
 #include "ldp.h"
 @@ -370,26 +371,28 @@ exit_func(int s, char *recvspace)
 	return 0;
+}
 /*
  * Show functions
  */
 int
 show_neighbours(int s, char *recvspace)
+{
 	struct ldp_peer *p;
 	struct ldp_peer_address *wp;
 	struct sockaddr_in ssin;
 	socklen_t sin_len = sizeof(struct sockaddr_in);
 	int enc;
 	socklen_t enclen = sizeof(enc);
 	SLIST_FOREACH(p, &ldp_peer_head, peers) {
 		snprintf(sendspace, MAXSEND, "LDP peer: %s\n",
 		    inet_ntoa(p->ldp_id));
 		writestr(s, sendspace);
 		snprintf(sendspace, MAXSEND, "Transport address: %s\n",
 		    inet_ntoa(p->transport_address));
 		writestr(s, sendspace);
 		snprintf(sendspace, MAXSEND, "Next-hop address: %s\n",
 		    inet_ntoa(p->address));
 		writestr(s, sendspace);
 		snprintf(sendspace, MAXSEND, "State: %s\n",
 		    ldp_state_to_name(p->state));
 @@ -400,26 +403,35 @@ show_neighbours(int s, char *recvspace)
 			writestr(s, sendspace);
+		}
 		snprintf(sendspace, MAXSEND, "Holdtime: %d\nTimeout: %d\n",
 			p->holdtime, p->timeout);
 		writestr(s, sendspace);
 		switch(p->state) {
 		    case LDP_PEER_CONNECTING:
 		    case LDP_PEER_CONNECTED:
 		    case LDP_PEER_ESTABLISHED:
 			if (getsockname(p->socket,(struct sockaddr *) &ssin,
 			    &sin_len))
 				break;
 			if (getsockopt(p->socket, IPPROTO_TCP, TCP_MD5SIG,
 			    &enc, &enclen) == 0) {
 				snprintf(sendspace, MAXSEND,
 				    "Authenticated: %s\n",
 				    enc != 0 ? "YES" : "NO");
 				writestr(s, sendspace);
+			}
 			snprintf(sendspace, MAXSEND,"Socket: %d\nLocal %s:%d\n",
 			    p->socket, inet_ntoa(ssin.sin_addr),
 			    ntohs(ssin.sin_port));
 			writestr(s, sendspace);
 			if (getpeername(p->socket,(struct sockaddr *) &ssin,
 			    &sin_len))
 				break;
 			snprintf(sendspace, MAXSEND, "Remote %s:%d\n",
 				inet_ntoa(ssin.sin_addr), ntohs(ssin.sin_port));
 			writestr(s, sendspace);
+		}