 @@ -1,14 +1,14 @@
-/* $NetBSD: fsm.c,v 1.7 2013/01/26 17:29:55 kefren Exp $ */
+/* $NetBSD: fsm.c,v 1.8 2013/01/28 20:06:52 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.
 @@ -45,108 +45,113 @@
 #include "socketops.h"
 #include "ldp_errors.h"
 #include "fsm.h"
 char            my_ldp_id[20];
 struct sockaddr	mplssockaddr;
 /* Processing a hello */
 void
 run_ldp_hello(struct ldp_pdu * pduid, struct hello_tlv * ht,
     struct sockaddr * padd, struct in_addr * ladd, int mysock)
+{
 	struct ldp_peer *peer = NULL;
 	union sockunion peer_addr;
 	struct transport_address_tlv *trtlv;
 	struct hello_info *hi;
 	if ((!pduid) || (!ht))
 		return;
 	debugp("Hello received for address: %s\n", inet_ntoa(*ladd));
 	debugp("Hello: Type: 0x%.4X Length: %.2d ID: %.8X\n", ht->type,
 	    ht->length, ht->messageid);
 	/* Add it to hello list or just update timer */
 	SLIST_FOREACH(hi, &hello_info_head, infos)
 		if (hi->ldp_id.s_addr == pduid->ldp_id.s_addr)
 			break;
 	if (hi == NULL) {
 		hi = malloc(sizeof(*hi));
 		if (!hi) {
 			fatalp("Cannot alloc a hello info structure");
 			return;
+		}
 		hi->ldp_id.s_addr = pduid->ldp_id.s_addr;
 		hi->transport_address.sa.sa_family = 0;
 		SLIST_INSERT_HEAD(&hello_info_head, hi, infos);
 	} else
 		/* Just update timer */
 		hi->keepalive = LDP_HELLO_KEEP;
 	if (ht->length <= 4)	/* Common hello parameters */
 		return;
 	ht->ch.type = ntohs(ht->ch.type);
 	ht->ch.length = ntohs(ht->ch.length);
 	ht->ch.holdtime = ntohs(ht->ch.holdtime);
 	ht->ch.res = ntohs(ht->ch.res);
 	debugp("Common hello Type: 0x%.4X Length: %.2d R:%d T:%d"
 	    " Hold time: %d\n", ht->ch.type, ht->ch.length,
 	    ht->ch.tr / 2, ht->ch.tr % 2, ht->ch.holdtime);
 	if (ht->ch.holdtime != 0)
 		hi->keepalive = ht->ch.holdtime;
 	else {
 		if (ht->ch.res >> 15 == 0)
 			hi->keepalive = LDP_HELLO_KEEP;
 		else
 			hi->keepalive = LDP_THELLO_KEEP;
+	}
 	if (!get_ldp_peer_by_id(&pduid->ldp_id)) {
 		/* Check transport TLV */
 		if (pduid->length - PDU_PAYLOAD_LENGTH -
-		    sizeof(struct hello_tlv) > 3) {
+		    sizeof(struct hello_tlv) >= 8) {
-			trtlv = (struct transport_address_tlv *) &ht[1];
+			trtlv = (struct transport_address_tlv *)(ht + 1);
-			if (trtlv->type == TLV_IPV4_TRANSPORT) {
+			if (trtlv->type == htons(TLV_IPV4_TRANSPORT)) {
-				peer_addr.sin.sin_family = AF_INET;
+				hi->transport_address.sin.sin_family = AF_INET;
-				peer_addr.sin.sin_len =
+				hi->transport_address.sin.sin_len =
 				    sizeof(struct sockaddr_in);
-				memcpy(&peer_addr.sin.sin_addr, &trtlv->address,
+				memcpy(&hi->transport_address.sin.sin_addr,
-				    sizeof(struct in_addr));
+				    &trtlv->address, sizeof(struct in_addr));
-			} else if (trtlv->type == TLV_IPV6_TRANSPORT) {
+			} else if (trtlv->type == htons(TLV_IPV6_TRANSPORT)) {
-				peer_addr.sin6.sin6_family = AF_INET6;
+				hi->transport_address.sin6.sin6_family =
-				peer_addr.sin6.sin6_len =
+				    AF_INET6;
 				hi->transport_address.sin6.sin6_len =
 				    sizeof(struct sockaddr_in6);
-				memcpy(&peer_addr.sin6.sin6_addr,
+				memcpy(&hi->transport_address.sin6.sin6_addr,
 				    &trtlv->address, sizeof(struct in6_addr));
 			} else
 				warnp("Unknown AF %x for transport address\n",
 				    ntohs(trtlv->type));
 		} else {
 			trtlv = NULL;
-			peer_addr.sin.sin_family = AF_INET;
+			hi->transport_address.sin.sin_family = AF_INET;
-			peer_addr.sin.sin_len = sizeof(struct sockaddr_in);
+			hi->transport_address.sin.sin_len =
-			memcpy(&peer_addr.sin.sin_addr, &pduid->ldp_id,
+			    sizeof(struct sockaddr_in);
-			    sizeof(struct in_addr));
+			memcpy(&hi->transport_address.sin.sin_addr,
 			    &pduid->ldp_id, sizeof(struct in_addr));
+		}
 		/*
 		 * RFC 5036 2.5.2: If A1 > A2, LSR1 plays the active role;
 		 * otherwise it is passive.
 		 */
-		/* XXX: check for IPv6 too */
+		/* XXX TODO: check for IPv6 too */
-		if (peer_addr.sa.sa_family == AF_INET &&
+		if (hi->transport_address.sa.sa_family == AF_INET &&
-		    ntohl(peer_addr.sin.sin_addr.s_addr)< ntohl(ladd->s_addr)) {
+		    ntohl(hi->transport_address.sin.sin_addr.s_addr) <
 		    ntohl(ladd->s_addr)) {
 			peer = ldp_peer_new(&pduid->ldp_id, padd,
-				trtlv != NULL ? &peer_addr.sa : NULL,
+				&hi->transport_address.sa,
 				ht->ch.holdtime, 0);
-			if (!peer)
+			if (peer == NULL)
 				return;
-			if (peer && peer->state == LDP_PEER_CONNECTED)
+			if (peer->state == LDP_PEER_CONNECTED)
 				send_initialize(peer);
+		}
+	}
+}
 struct address_list_tlv *
 build_address_list_tlv(void)
+{
 	struct address_list_tlv *t;
 	struct ifaddrs *ifa, *ifb;
 	struct sockaddr_in *sa;
 	struct in_addr *ia;
 	uint16_t       adrcount = 0;

 @@ -1,14 +1,14 @@
-/* $NetBSD: ldp_command.c,v 1.8 2013/01/26 17:29:55 kefren Exp $ */
+/* $NetBSD: ldp_command.c,v 1.9 2013/01/28 20:06:52 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.
 @@ -545,28 +545,32 @@ show_debug(int s, char *recvspace)
 	snprintf(sendspace, MAXSEND, "Debug: %s\n",
 		debug_f ? "YES" : "NO");
 	writestr(s, sendspace);
 	return 1;
+}
 static int
 show_hellos(int s, char *recvspace)
+{
 	struct hello_info *hi;
 	SLIST_FOREACH(hi, &hello_info_head, infos) {
-		snprintf(sendspace, MAXSEND, "%s: %ds\n", inet_ntoa(hi->ldp_id),
+		snprintf(sendspace, MAXSEND,
-		    hi->keepalive);
+		    "ID: %s\nKeepalive: %ds\nTransport address: %s\n\n",
 		    inet_ntoa(hi->ldp_id),
 		    hi->keepalive,
 		    hi->transport_address.sa.sa_family != 0 ?
 		    satos(&hi->transport_address.sa) : "None");
 		writestr(s, sendspace);
+	}
 	return 1;
+}
 static int
 show_parameters(int s, char *recvspace)
+{
 	snprintf(sendspace, MAXSEND, "LDP ID: %s\nProtocol version: %d\n"
 		 "Hello time: %d\nKeepalive time: %d\nHoldtime: %d\n"
 		 "Minimum label: %d\nMaximum label: %d\n",
 		my_ldp_id,
 		LDP_VERSION,

 @@ -1,14 +1,14 @@
-/* $NetBSD: socketops.c,v 1.20 2013/01/26 21:07:49 kefren Exp $ */
+/* $NetBSD: socketops.c,v 1.21 2013/01/28 20:06:52 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.
 @@ -741,35 +741,33 @@ send_hello_alarm(int unused)
 				break;
 			}	/* switch */
 	/* send keepalives */
 	if (!(t % ldp_keepalive_time)) {
 		SLIST_FOREACH(p, &ldp_peer_head, peers)
 		    if (p->state == LDP_PEER_ESTABLISHED) {
 			debugp("Sending KeepAlive to %s\n",
 			    inet_ntoa(p->ldp_id));
 			keep_alive(p);
+		    }
+	}
-	/* Decrement hello info keepalives */
+	/* Decrement and Check hello keepalives */
-	SLIST_FOREACH(hi, &hello_info_head, infos)
+	SLIST_FOREACH_SAFE(hi, &hello_info_head, infos, hinext) {
 		if (hi->keepalive != 0xFFFF)
 			hi->keepalive--;
 	/* Check hello keepalives */
 	SLIST_FOREACH_SAFE(hi, &hello_info_head, infos, hinext)
 		if (hi->keepalive < 1)
 			SLIST_REMOVE(&hello_info_head, hi, hello_info, infos);
+	}
 	/* Set the alarm again and bail out */
 	alarm(1);
 	errno = olderrno;
+}
 static void
 bail_out(int x)
+{
 	ldp_peer_holddown_all();
 	flush_mpls_routes();
 	exit(0);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: socketops.h,v 1.4 2013/01/26 17:29:55 kefren Exp $ */
+/* $NetBSD: socketops.h,v 1.5 2013/01/28 20:06:52 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.
 @@ -46,26 +46,27 @@ int	create_hello_sockets(void);
 int	create_listening_socket(void);
 void	send_hello(void);
 int	get_message_id(void);
 int	the_big_loop(void);
 void	new_peer_connection(void);
 void	send_initialize(struct ldp_peer *);
 void	keep_alive(struct ldp_peer *);
 void	recv_session_pdu(struct ldp_peer *);
 int	send_message(struct ldp_peer *, struct ldp_pdu *, struct tlv *);
 int	send_tlv(struct ldp_peer *, struct tlv *);
 int	send_addresses(struct ldp_peer *);
 struct	hello_info {
-	struct in_addr address, transport_address, ldp_id;
+	union sockunion transport_address;
 	struct in_addr ldp_id;
 	int keepalive;
 	SLIST_ENTRY(hello_info) infos;
 };
 SLIST_HEAD(,hello_info) hello_info_head;
 struct	hello_socket {
 	int type, socket;
 	SLIST_ENTRY(hello_socket) listentry;
 };
 SLIST_HEAD(,hello_socket) hello_socket_head;
 #endif	/* !_SOCKETOPS_H_ */