bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

packages/mini_snmpd: fix binding on IPv4 when IPv6 support is enabled

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@29040 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2011-11-13 18:50:07 +00:00
parent 012eec3f60
commit 26bd7b8d0e
2 changed files with 77 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/mini_snmpd/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mini_snmpd PKG_NAME:=mini_snmpd
PKG_VERSION:=1.2b PKG_VERSION:=1.2b
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://members.aon.at/linuxfreak/linux/ PKG_SOURCE_URL:=http://members.aon.at/linuxfreak/linux/

93
net/mini_snmpd/patches/100-dualstack.patch
View File

@ -1,14 +1,17 @@
--- a/globals.c --- a/globals.c
+++ b/globals.c +++ b/globals.c
@@ -31,6 +31,8 @@ @@ -27,9 +27,9 @@
const struct in_addr inaddr_any = { INADDR_ANY }; * Global variables
#endif */
+int g_family = AF_INET; -#ifdef __IPV4__
const struct in_addr inaddr_any = { INADDR_ANY };
-#endif
+ +
+int g_family = AF_INET;
in_port_t g_udp_port = 161; in_port_t g_udp_port = 161;
in_port_t g_tcp_port = 161; in_port_t g_tcp_port = 161;
int g_timeout = 100;
--- a/mini_snmpd.c --- a/mini_snmpd.c
+++ b/mini_snmpd.c +++ b/mini_snmpd.c
@@ -54,6 +54,10 @@ static void print_help(void) @@ -54,6 +54,10 @@ static void print_help(void)
@ -99,7 +102,21 @@
{ "timeout", 1, 0, 't' }, { "timeout", 1, 0, 't' },
{ "traps", 1, 0, 'T' }, { "traps", 1, 0, 'T' },
{ "auth", 0, 0, 'a' }, { "auth", 0, 0, 'a' },
@@ -396,6 +408,14 @@ int main(int argc, char *argv[]) @@ -327,7 +339,12 @@ int main(int argc, char *argv[])
int option_index = 1;
int c;
- struct my_sockaddr_t sockaddr;
+ union {
+ struct sockaddr_in sa;
+#ifdef __IPV6__
+ struct sockaddr_in6 sa6;
+#endif
+ } sockaddr;
my_socklen_t socklen;
struct timeval tv_last;
struct timeval tv_now;
@@ -396,6 +413,14 @@ int main(int argc, char *argv[])
case 'v': case 'v':
g_verbose = 1; g_verbose = 1;
break; break;
@ -114,7 +131,7 @@
case 'l': case 'l':
print_version(); print_version();
exit(EXIT_ARGS); exit(EXIT_ARGS);
@@ -435,12 +455,12 @@ int main(int argc, char *argv[]) @@ -435,15 +460,24 @@ int main(int argc, char *argv[])
#endif #endif
/* Open the server's UDP port and prepare it for listening */ /* Open the server's UDP port and prepare it for listening */
@ -125,11 +142,26 @@
exit(EXIT_SYSCALL); exit(EXIT_SYSCALL);
} }
- sockaddr.my_sin_family = my_af_inet; - sockaddr.my_sin_family = my_af_inet;
+ sockaddr.my_sin_family = g_family; - sockaddr.my_sin_port = htons(g_udp_port);
sockaddr.my_sin_port = htons(g_udp_port); - sockaddr.my_sin_addr = my_inaddr_any;
sockaddr.my_sin_addr = my_inaddr_any; - socklen = sizeof (sockaddr);
socklen = sizeof (sockaddr); + if (g_family == AF_INET) {
@@ -457,7 +477,7 @@ int main(int argc, char *argv[]) + sockaddr.sa.sin_family = g_family;
+ sockaddr.sa.sin_port = htons(g_udp_port);
+ sockaddr.sa.sin_addr = inaddr_any;
+ socklen = sizeof(sockaddr.sa);
+#ifdef __IPV6__
+ } else {
+ sockaddr.sa6.sin6_family = g_family;
+ sockaddr.sa6.sin6_port = htons(g_udp_port);
+ sockaddr.sa6.sin6_addr = in6addr_any;
+ socklen = sizeof(sockaddr.sa6);
+#endif
+ }
if (bind(g_udp_sockfd, (struct sockaddr *)&sockaddr, socklen) == -1) {
lprintf(LOG_ERR, "could not bind UDP socket to port %d: %m\n", g_udp_port);
exit(EXIT_SYSCALL);
@@ -457,7 +491,7 @@ int main(int argc, char *argv[])
} }
/* Open the server's TCP port and prepare it for listening */ /* Open the server's TCP port and prepare it for listening */
@ -138,15 +170,30 @@
if (g_tcp_sockfd == -1) { if (g_tcp_sockfd == -1) {
lprintf(LOG_ERR, "could not create TCP socket: %m\n"); lprintf(LOG_ERR, "could not create TCP socket: %m\n");
exit(EXIT_SYSCALL); exit(EXIT_SYSCALL);
@@ -474,7 +494,7 @@ int main(int argc, char *argv[]) @@ -474,10 +508,19 @@ int main(int argc, char *argv[])
lprintf(LOG_WARNING, "could not set SO_REUSEADDR on TCP socket: %m\n"); lprintf(LOG_WARNING, "could not set SO_REUSEADDR on TCP socket: %m\n");
exit(EXIT_SYSCALL); exit(EXIT_SYSCALL);
} }
- sockaddr.my_sin_family = my_af_inet; - sockaddr.my_sin_family = my_af_inet;
+ sockaddr.my_sin_family = g_family; - sockaddr.my_sin_port = htons(g_tcp_port);
sockaddr.my_sin_port = htons(g_tcp_port); - sockaddr.my_sin_addr = my_inaddr_any;
sockaddr.my_sin_addr = my_inaddr_any; - socklen = sizeof (sockaddr);
socklen = sizeof (sockaddr); + if (g_family == AF_INET) {
+ sockaddr.sa.sin_family = g_family;
+ sockaddr.sa.sin_port = htons(g_udp_port);
+ sockaddr.sa.sin_addr = inaddr_any;
+ socklen = sizeof(sockaddr.sa);
+#ifdef __IPV6__
+ } else {
+ sockaddr.sa6.sin6_family = g_family;
+ sockaddr.sa6.sin6_port = htons(g_udp_port);
+ sockaddr.sa6.sin6_addr = in6addr_any;
+ socklen = sizeof(sockaddr.sa6);
+#endif
+ }
if (bind(g_tcp_sockfd, (struct sockaddr *)&sockaddr, socklen) == -1) {
lprintf(LOG_ERR, "could not bind TCP socket to port %d: %m\n", g_tcp_port);
exit(EXIT_SYSCALL);
--- a/mini_snmpd.h --- a/mini_snmpd.h
+++ b/mini_snmpd.h +++ b/mini_snmpd.h
@@ -255,6 +255,7 @@ typedef struct demoinfo_s { @@ -255,6 +255,7 @@ typedef struct demoinfo_s {
@ -157,3 +204,15 @@
extern int g_timeout; extern int g_timeout;
extern int g_auth; extern int g_auth;
extern int g_verbose; extern int g_verbose;
@@ -265,9 +266,9 @@ extern char *g_vendor;
extern char *g_location;
extern char *g_contact;
extern char *g_bind_to_device;
-#ifdef __IPV4__
+
extern const struct in_addr inaddr_any;
-#endif
+
extern char *g_disk_list[MAX_NR_DISKS];
extern int g_disk_list_length;