[B.A.T.M.A.N.] [PATCH 1/2] alfred: Print libc errors with perror

[B.A.T.M.A.N.] [PATCH 1/2] alfred: Print libc errors with perror

[Sven Eckelmann]

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 debugfs.c          |  4 +---
 gpsd/alfred-gpsd.c |  9 +++------
 netsock.c          | 12 ++++++------
 recv.c             |  3 +--
 server.c           | 11 ++++-------
 unix_sock.c        | 21 +++++++--------------
 vis/vis.c          | 10 ++++------
 7 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/debugfs.c b/debugfs.c
index 4b8801a..fbf992e 100644
--- a/debugfs.c
+++ b/debugfs.c
@@ -89,9 +89,7 @@ static const char *debugfs_find_mountpoint(void)
 	/* give up and parse /proc/mounts */
 	fp = fopen("/proc/mounts", "r");
 	if (fp == NULL) {
-		fprintf(stderr,
-			"Error - can't open /proc/mounts for read: %s\n",
-			strerror(errno));
+		perror("Error - can't open /proc/mounts for read");
 		return NULL;
 	}
 
diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c
index 06c0680..6e88dc7 100644
--- a/gpsd/alfred-gpsd.c
+++ b/gpsd/alfred-gpsd.c
@@ -29,8 +29,7 @@ static int alfred_open_sock(struct globals *globals)
 
 	globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0);
 	if (globals->unix_sock < 0) {
-		fprintf(stderr, "can't create unix socket: %s\n",
-			strerror(errno));
+		perror("can't create unix socket");
 		return -1;
 	}
 
@@ -41,8 +40,7 @@ static int alfred_open_sock(struct globals *globals)
 
 	if (connect(globals->unix_sock, (struct sockaddr *)&addr,
 		    sizeof(addr)) < 0) {
-		fprintf(stderr, "can't connect to unix socket: %s\n",
-			strerror(errno));
+		perror("can't connect to unix socket");
 		return -1;
 	}
 
@@ -514,8 +512,7 @@ static int gpsd_server(struct globals *globals)
 			errno = 0;
 			ret = select(max_fd, &fds, NULL, NULL, &tv);
 			if (ret == -1 && errno != EINTR)
-				printf("select error %s(%d)\n",
-				       strerror(errno), errno);
+				perror("select error");
 
 			if (ret == 1)
 				gpsd_read_gpsd(globals);
diff --git a/netsock.c b/netsock.c
index 305983f..a1a97e4 100644
--- a/netsock.c
+++ b/netsock.c
@@ -54,7 +54,7 @@ int netsock_open(struct globals *globals)
 
 	sock = socket(PF_INET6, SOCK_DGRAM, 0);
 	if (sock  < 0) {
-		fprintf(stderr, "can't open socket: %s\n", strerror(errno));
+		perror("can't open socket");
 		return -1;
 	}
 
@@ -62,7 +62,7 @@ int netsock_open(struct globals *globals)
 	strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ);
 	ifr.ifr_name[IFNAMSIZ - 1] = '\0';
 	if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) {
-		fprintf(stderr, "can't get interface: %s\n", strerror(errno));
+		perror("can't get interface");
 		goto err;
 	}
 
@@ -75,7 +75,7 @@ int netsock_open(struct globals *globals)
 	sin6.sin6_scope_id = ifr.ifr_ifindex;
 
 	if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) {
-		fprintf(stderr, "can't get MAC address: %s\n", strerror(errno));
+		perror("can't get MAC address");
 		goto err;
 	}
 
@@ -83,19 +83,19 @@ int netsock_open(struct globals *globals)
 	mac_to_ipv6(&globals->hwaddr, &globals->address);
 
 	if (bind(sock, (struct sockaddr *)&sin6, sizeof(sin6)) < 0) {
-		fprintf(stderr, "can't bind\n");
+		perror("can't bind");
 		goto err;
 	}
 
 	ret = fcntl(sock, F_GETFL, 0);
 	if (ret < 0) {
-		fprintf(stderr, "failed to get file status flags\n");
+		perror("failed to get file status flags");
 		goto err;
 	}
 
 	ret = fcntl(sock, F_SETFL, ret | O_NONBLOCK);
 	if (ret < 0) {
-		fprintf(stderr, "failed to set file status flags\n");
+		perror("failed to set file status flags");
 		goto err;
 	}
 
diff --git a/recv.c b/recv.c
index 724c551..2948547 100644
--- a/recv.c
+++ b/recv.c
@@ -385,8 +385,7 @@ int recv_alfred_packet(struct globals *globals)
 	length = recvfrom(globals->netsock, buf, sizeof(buf), 0,
 			  (struct sockaddr *)&source, &sourcelen);
 	if (length <= 0) {
-		fprintf(stderr, "read from network socket failed: %s\n",
-			strerror(errno));
+		perror("read from network socket failed");
 		return -1;
 	}
 
diff --git a/server.c b/server.c
index b060d55..94e6145 100644
--- a/server.c
+++ b/server.c
@@ -236,7 +236,7 @@ static void check_if_socket(struct globals *globals)
 
 	sock = socket(PF_INET6, SOCK_DGRAM, 0);
 	if (sock < 0) {
-		fprintf(stderr, "can't open socket: %s\n", strerror(errno));
+		perror("can't open socket");
 		return;
 	}
 
@@ -244,8 +244,7 @@ static void check_if_socket(struct globals *globals)
 	strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ);
 	ifr.ifr_name[IFNAMSIZ - 1] = '\0';
 	if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) {
-		fprintf(stderr, "can't get interface: %s, closing netsock\n",
-			strerror(errno));
+		perror("can't get interface, closing netsock");
 		goto close;
 	}
 
@@ -257,8 +256,7 @@ static void check_if_socket(struct globals *globals)
 	}
 
 	if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) {
-		fprintf(stderr, "can't get MAC address: %s, closing netsock\n",
-			strerror(errno));
+		perror("can't get MAC address, closing netsock");
 		goto close;
 	}
 
@@ -330,8 +328,7 @@ int alfred_server(struct globals *globals)
 		ret = pselect(maxsock + 1, &fds, NULL, &errfds, &tv, NULL);
 
 		if (ret == -1) {
-			fprintf(stderr, "main loop select failed ...: %s\n",
-				strerror(errno));
+			perror("main loop select failed ...");
 		} else if (ret) {
 			if (globals->netsock >= 0 &&
 			    FD_ISSET(globals->netsock, &errfds)) {
diff --git a/unix_sock.c b/unix_sock.c
index fb7e391..cc0d25c 100644
--- a/unix_sock.c
+++ b/unix_sock.c
@@ -43,8 +43,7 @@ int unix_sock_open_daemon(struct globals *globals)
 
 	globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0);
 	if (globals->unix_sock < 0) {
-		fprintf(stderr, "can't create unix socket: %s\n",
-			strerror(errno));
+		perror("can't create unix socket");
 		return -1;
 	}
 
@@ -55,14 +54,12 @@ int unix_sock_open_daemon(struct globals *globals)
 
 	if (bind(globals->unix_sock, (struct sockaddr *)&addr,
 		 sizeof(addr)) < 0) {
-		fprintf(stderr, "can't bind unix socket: %s\n",
-			strerror(errno));
+		perror("can't bind unix socket");
 		return -1;
 	}
 
 	if (listen(globals->unix_sock, 10) < 0) {
-		fprintf(stderr, "can't listen on unix socket: %s\n",
-			strerror(errno));
+		perror("can't listen on unix socket");
 		return -1;
 	}
 
@@ -75,8 +72,7 @@ int unix_sock_open_client(struct globals *globals)
 
 	globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0);
 	if (globals->unix_sock < 0) {
-		fprintf(stderr, "can't create unix socket: %s\n",
-			strerror(errno));
+		perror("can't create unix socket");
 		return -1;
 	}
 
@@ -87,8 +83,7 @@ int unix_sock_open_client(struct globals *globals)
 
 	if (connect(globals->unix_sock, (struct sockaddr *)&addr,
 		    sizeof(addr)) < 0) {
-		fprintf(stderr, "can't connect to unix socket: %s\n",
-			strerror(errno));
+		perror("can't connect to unix socket");
 		return -1;
 	}
 
@@ -315,16 +310,14 @@ int unix_sock_read(struct globals *globals)
 	client_sock = accept(globals->unix_sock, (struct sockaddr *)&sun_addr,
 			     &sun_size);
 	if (client_sock < 0) {
-		fprintf(stderr, "can't accept unix connection: %s\n",
-			strerror(errno));
+		perror("can't accept unix connection");
 		return -1;
 	}
 
 	/* we assume that we can instantly read here. */
 	length = read(client_sock, buf, sizeof(buf));
 	if (length <= 0) {
-		fprintf(stderr, "read from unix socket failed: %s\n",
-			strerror(errno));
+		perror("read from unix socket failed");
 		goto err;
 	}
 
diff --git a/vis/vis.c b/vis/vis.c
index 0cc4981..6cc4034 100644
--- a/vis/vis.c
+++ b/vis/vis.c
@@ -108,7 +108,7 @@ static int get_if_mac(char *ifname, uint8_t *mac)
 	ifr.ifr_name[IFNAMSIZ - 1] = '\0';
 
 	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-		fprintf(stderr, "can't get interface: %s\n", strerror(errno));
+		perror("can't get interface");
 		return -1;
 	}
 
@@ -117,7 +117,7 @@ static int get_if_mac(char *ifname, uint8_t *mac)
 	close(sock);
 
 	if (ret == -1) {
-		fprintf(stderr, "can't get MAC address: %s\n", strerror(errno));
+		perror("can't get MAC address");
 		return -1;
 	}
 
@@ -162,8 +162,7 @@ static int alfred_open_sock(struct globals *globals)
 
 	globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0);
 	if (globals->unix_sock < 0) {
-		fprintf(stderr, "can't create unix socket: %s\n",
-			strerror(errno));
+		perror("can't create unix socket");
 		return -1;
 	}
 
@@ -174,8 +173,7 @@ static int alfred_open_sock(struct globals *globals)
 
 	if (connect(globals->unix_sock, (struct sockaddr *)&addr,
 		    sizeof(addr)) < 0) {
-		fprintf(stderr, "can't connect to unix socket: %s\n",
-			strerror(errno));
+		perror("can't connect to unix socket");
 		return -1;
 	}
 
-- 
2.0.1

[B.A.T.M.A.N.] [PATCH 2/2] alfred: Bind alfred to a specific device

[Sven Eckelmann]

It is necessary to bind the alfred process to a specific device to allow
multiple instances of it to run at the same time but on different network
interfaces. Just using the scope_id with IPv6 is not enough to bind only on
this specific network device. Also using a specific address+port would not work
because then the master announcements would not be received anymore.

The bind to device only works when the user has root privileges. Therefore,
alfred must now be started as root.

Reported-by: Tobias Hachmer <tobias@hachmer.de>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 netsock.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/netsock.c b/netsock.c
index a1a97e4..b59b7b7 100644
--- a/netsock.c
+++ b/netsock.c
@@ -52,7 +52,7 @@ int netsock_open(struct globals *globals)
 
 	globals->netsock = -1;
 
-	sock = socket(PF_INET6, SOCK_DGRAM, 0);
+	sock = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
 	if (sock  < 0) {
 		perror("can't open socket");
 		return -1;
@@ -82,6 +82,12 @@ int netsock_open(struct globals *globals)
 	memcpy(&globals->hwaddr, &ifr.ifr_hwaddr.sa_data, 6);
 	mac_to_ipv6(&globals->hwaddr, &globals->address);
 
+	if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE,
+		       globals->interface, strlen(globals->interface) + 1)) {
+		perror("can't bind to device");
+		goto err;
+	}
+
 	if (bind(sock, (struct sockaddr *)&sin6, sizeof(sin6)) < 0) {
 		perror("can't bind");
 		goto err;
-- 
2.0.1

Re: [B.A.T.M.A.N.] [PATCH 1/2] alfred: Print libc errors with perror

[Simon Wunderlich]

Series applied in commits 6f1a3f3 and e9e98b1.

Thanks!
     Simon

Re: [B.A.T.M.A.N.] [PATCH 1/2] alfred: Print libc errors with perror

[Tobias Hachmer]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hello Simon,

On 07/29/2014 02:37 PM, Simon Wunderlich wrote:
> Series applied in commits 6f1a3f3 and e9e98b1.

Thanks a lot! Compiles and is working, now ...

Greetings,
Tobias Hachmer
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCgAGBQJT18cdAAoJEHXGlTiIv2V4X0kQAMfluRnM9QjThTbA+uooHFIZ
VODjeDsmVSO0hOlidiu+5n1UYy2J6EEeHuqzbxtHk+edUHKA1Vf618Fa7pZgAirg
NUomtwh3adfMMD3QEWNp4rA5GQBdKLm/VVqGsZrrvCGmn9xuyXkKV9cIS7vhu+S/
YzpCl/nzzsNr7J5XHfLq09qtbDfZU86GLGAA1geNThgbasUdDvemIKM75SEjS+No
iiEIOE75BvXXFsrhX+KWJvmgjG1r5MCL5axP6vf/GpezqLlZEScJ7fpsIHy7lPM8
AAiHsI7xIK5edQ9mHfUKXAhDv9fBrTSloBDmaVGobYnBj8F0GvvuAR0osfJiMi+h
RlURh+KQEpPmTUVagei6e7MO1mKTlGLxFQutPuDKaIaO2BMKi0iU7c1+AtuTlcX7
uriZ8Qn8A4OtKhi/9/NADc44FUR3jM42p/doK4WZGBqMBk4uf2bycgG0zOoP0jhF
7oSRKYlfgmt3jOr95ZVo5I5M/T2ZjGtW+Im4nEN4K95ZFISfCFRGpXl9QMy4K+dC
9ck3ZQuX4s/UCkQFueu4CdJB+0FnyHbaEByNQ5fch8Hn3574OvAlf55u9kOb8/To
gSHdmqBK+YC0AkuuWsLwM7waNYKssoBnDJ7V3029p0eFDF2UcmVGpOHG6tb4/r4w
dEcUG8MY4KFkwEIaNN3q
=vfVr
-----END PGP SIGNATURE-----