From: Guus Sliepen <guus@tinc-vpn.org>
Date: Tue, 13 Nov 2012 14:01:43 +0000 (+0100)
Subject: Don't take the address of a variable whose scope is about to disappear.
X-Git-Tag: release-1.0.20~11
X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=commitdiff_plain;h=7ad1369857935e6e823690cd3779f49d98a3c460;hp=02c263d102c4bb6de2f50a8486d19211ea1a65a4

Don't take the address of a variable whose scope is about to disappear.

Conflicts:
	src/net_packet.c
---

diff --git a/src/net_packet.c b/src/net_packet.c
index cd8d98a..7a473ab 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -500,16 +500,16 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
 	struct sockaddr *sa;
 	socklen_t sl;
 	int sock;
+	sockaddr_t broadcast;
 
 	/* Overloaded use of priority field: -1 means local broadcast */
 
 	if(origpriority == -1 && n->prevedge) {
-		struct sockaddr_in in;
-		in.sin_family = AF_INET;
-		in.sin_addr.s_addr = -1;
-		in.sin_port = n->prevedge->address.in.sin_port;
-		sa = (struct sockaddr *)&in;
-		sl = sizeof in;
+		broadcast.in.sin_family = AF_INET;
+		broadcast.in.sin_addr.s_addr = -1;
+		broadcast.in.sin_port = n->prevedge->address.in.sin_port;
+		sa = &broadcast.sa;
+		sl = sizeof broadcast.in;
 		sock = 0;
 	} else {
 		if(origpriority == -1)