From: acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 1 Nov 2010 15:52:43 +0000 (+0000)
Subject: net/mini_snmpd: update to version 1.2b
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=8a83fa3a177edc63628c85431f6d4e84ef0811ed;p=packages.git

net/mini_snmpd: update to version 1.2b


git-svn-id: svn://svn.openwrt.org/openwrt/packages@23765 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/mini_snmpd/Makefile b/net/mini_snmpd/Makefile
index cfd199254..1e7d70566 100644
--- a/net/mini_snmpd/Makefile
+++ b/net/mini_snmpd/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mini_snmpd
-PKG_VERSION:=1.0
-PKG_RELEASE:=7
+PKG_VERSION:=1.2b
+PKG_RELEASE:=1
 
-PKG_SOURCE:=mini_snmpd.tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://members.aon.at/linuxfreak/linux/
-PKG_MD5SUM:=13f2202ff01ff6b6463989f34f453063
+PKG_MD5SUM:=9e432c50ba8216d7fab0983b11b7112a
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
@@ -30,23 +30,15 @@ define Package/mini-snmpd
 $(call Package/mini-snmpd/Default)
   SECTION:=net
   CATEGORY:=Network
-  TITLE+= (IPv4 only)
-  VARIANT:=ipv4
+  TITLE+= Mini Snmpd
 endef
 
-define Package/mini-snmpd6
-$(call Package/mini-snmpd/Default)
-  SECTION:=ipv6
-  CATEGORY:=IPv6
-  TITLE+= (IPv6 only)
-  VARIANT:=ipv6
-  DEPENDS:=+kmod-ipv6
-endef
-
-
 PKG_OFLAGS:=$(TARGET_CFLAGS) -DSYSLOG
-ifeq ($(BUILD_VARIANT),ipv6)
-  PKG_OFLAGS+= -DIPV6
+
+ifeq ($(CONFIG_IPV6),y)
+  PKG_OFLAGS+= -D__IPV6__
+else
+  PKG_OFLAGS+= -D__IPV4__
 endif
 
 MAKE_FLAGS+= \
@@ -70,4 +62,3 @@ endef
 Package/mini-snmpd6/install=$(Package/mini-snmpd/install)
 
 $(eval $(call BuildPackage,mini-snmpd))
-$(eval $(call BuildPackage,mini-snmpd6))
diff --git a/net/mini_snmpd/patches/101-opt_flags.patch b/net/mini_snmpd/patches/101-opt_flags.patch
index b34852f16..70dbce5d2 100644
--- a/net/mini_snmpd/patches/101-opt_flags.patch
+++ b/net/mini_snmpd/patches/101-opt_flags.patch
@@ -1,13 +1,14 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -30,8 +30,9 @@ HEADERS	= mini_snmpd.h
+@@ -32,9 +32,9 @@ HEADERS	= mini_snmpd.h
  SOURCES	= mini_snmpd.c protocol.c mib.c globals.c utils.c linux.c freebsd.c
- VERSION = 1.0
+ VERSION = 1.2b
  VENDOR	= .1.3.6.1.4.1
-+OFLAGS	= -O2 -DDEBUG
+-OFLAGS	= -O2 -DDEBUG -g
++OFLAGS	= -O2
  CFLAGS	= -Wall -Werror -DVERSION="\"$(VERSION)\"" -DVENDOR="\"$(VENDOR)\"" \
--	  -O2 -DDEBUG -D__LINUX__ -D__DEMO__
-+	  $(OFLAGS) -D__LINUX__ -D__DEMO__
+-	  $(OFLAGS) -D__TRAPS__ -D__LINUX__ -D__IPV6__
++	  $(OFLAGS) -D__TRAPS__ -D__LINUX__
+ LDFLAGS	= $(OFLAGS)
  TARGET	= mini_snmpd
  MAN 	= mini_snmpd.8
- DOC 	= CHANGELOG COPYING README TODO
diff --git a/net/mini_snmpd/patches/102-compile_fix.patch b/net/mini_snmpd/patches/102-compile_fix.patch
deleted file mode 100644
index 7bec638cd..000000000
--- a/net/mini_snmpd/patches/102-compile_fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/mini_snmpd.c
-+++ b/mini_snmpd.c
-@@ -134,7 +134,7 @@ static void handle_udp_client(void)
- 	} else if (rv != g_udp_client.size) {
- 		lprintf(LOG_WARNING, "could not send packet to UDP client %s:%d: "
- 			"only %d of %d bytes written\n", inet_ntoa(sockaddr.sin_addr),
--			sockaddr.sin_port, rv, g_udp_client.size);
-+			sockaddr.sin_port, rv, (int) g_udp_client.size);
- 	}
- #ifdef DEBUG
- 	dump_packet(&g_udp_client);
-@@ -211,7 +211,7 @@ static void handle_tcp_client_write(clie
- 	} else if (rv != client->size) {
- 		lprintf(LOG_WARNING, "could not send packet to TCP client %s:%d: "
- 			"only %d of %d bytes written\n", inet_ntoa(sockaddr.sin_addr),
--			sockaddr.sin_port, rv, client->size);
-+			sockaddr.sin_port, rv, (int) client->size);
- 		close(client->sockfd);
- 		client->sockfd = -1;
- 		return;
---- a/utils.c
-+++ b/utils.c
-@@ -106,7 +106,7 @@ void dump_packet(const client_t *client)
- 		}
- 	}
- 	lprintf(LOG_DEBUG, "%s %u bytes %s %s:%d (%s)\n",
--		client->outgoing ? "transmitted" : "received", client->size,
-+		client->outgoing ? "transmitted" : "received", (int) client->size,
- 		client->outgoing ? "to" : "from", inet_ntoa(client_addr),
- 		ntohs(client->port), buffer);
- }
diff --git a/net/mini_snmpd/patches/104-ipv6-support.patch b/net/mini_snmpd/patches/104-ipv6-support.patch
deleted file mode 100644
index 4d4e55751..000000000
--- a/net/mini_snmpd/patches/104-ipv6-support.patch
+++ /dev/null
@@ -1,332 +0,0 @@
---- a/globals.c
-+++ b/globals.c
-@@ -27,6 +27,9 @@
-  * Global variables
-  */
- 
-+#ifndef IPV6
-+const struct in_addr inaddr_any = { INADDR_ANY };
-+#endif
- in_port_t g_udp_port = 161;
- in_port_t g_tcp_port = 161;
- int g_timeout = 1;
---- a/mini_snmpd.c
-+++ b/mini_snmpd.c
-@@ -90,9 +90,10 @@ static void handle_signal(int signo)
- 
- static void handle_udp_client(void)
- {
--	struct sockaddr_in sockaddr;
-+	struct my_sockaddr_t sockaddr;
- 	socklen_t socklen;
- 	int rv;
-+	char straddr[my_inet_addrstrlen];
- 
- 	/* Read the whole UDP packet from the socket at once */
- 	socklen = sizeof (sockaddr);
-@@ -105,22 +106,23 @@ static void handle_udp_client(void)
- 	}
- 	g_udp_client.timestamp = time(NULL);
- 	g_udp_client.sockfd = g_udp_sockfd;
--	g_udp_client.addr = sockaddr.sin_addr.s_addr;
--	g_udp_client.port = sockaddr.sin_port;
-+	g_udp_client.addr = sockaddr.my_sin_addr;
-+	g_udp_client.port = sockaddr.my_sin_port;
- 	g_udp_client.size = rv;
- 	g_udp_client.outgoing = 0;
- #ifdef DEBUG
- 	dump_packet(&g_udp_client);
- #endif
-+	inet_ntop(my_af_inet, &sockaddr.my_sin_addr, straddr, sizeof(straddr));
- 
- 	/* Call the protocol handler which will prepare the response packet */
- 	if (snmp(&g_udp_client) == -1) {
- 		lprintf(LOG_WARNING, "could not handle packet from UDP client %s:%d: %m\n",
--			inet_ntoa(sockaddr.sin_addr), sockaddr.sin_port);
-+			straddr, sockaddr.my_sin_port);
- 		return;
- 	} else if (g_udp_client.size == 0) {
- 		lprintf(LOG_WARNING, "could not handle packet from UDP client %s:%d: ignored\n",
--			inet_ntoa(sockaddr.sin_addr), sockaddr.sin_port);
-+			straddr, sockaddr.my_sin_port);
- 		return;
- 	}
- 	g_udp_client.outgoing = 1;
-@@ -130,11 +132,11 @@ static void handle_udp_client(void)
- 		MSG_DONTWAIT, (struct sockaddr *)&sockaddr, socklen);
- 	if (rv == -1) {
- 		lprintf(LOG_WARNING, "could not send packet to UDP client %s:%d: %m\n",
--			inet_ntoa(sockaddr.sin_addr), sockaddr.sin_port);
-+			straddr, sockaddr.my_sin_port);
- 	} else if (rv != g_udp_client.size) {
- 		lprintf(LOG_WARNING, "could not send packet to UDP client %s:%d: "
--			"only %d of %d bytes written\n", inet_ntoa(sockaddr.sin_addr),
--			sockaddr.sin_port, rv, (int) g_udp_client.size);
-+			"only %d of %d bytes written\n", straddr,
-+			sockaddr.my_sin_port, rv, (int) g_udp_client.size);
- 	}
- #ifdef DEBUG
- 	dump_packet(&g_udp_client);
-@@ -143,11 +145,12 @@ static void handle_udp_client(void)
- 
- static void handle_tcp_connect(void)
- {
--	struct sockaddr_in tmp_sockaddr;
--	struct sockaddr_in sockaddr;
-+	struct my_sockaddr_t tmp_sockaddr;
-+	struct my_sockaddr_t sockaddr;
- 	socklen_t socklen;
- 	client_t *client;
- 	int rv;
-+	char straddr[my_inet_addrstrlen];
- 
- 	/* Accept the new connection (remember the client's IP address and port) */
- 	socklen = sizeof (sockaddr);
-@@ -168,10 +171,11 @@ static void handle_tcp_connect(void)
- 			lprintf(LOG_ERR, "could not accept TCP connection: internal error");
- 			exit(EXIT_SYSCALL);
- 		}
--		tmp_sockaddr.sin_addr.s_addr = client->addr;
--		tmp_sockaddr.sin_port = client->port;
-+		tmp_sockaddr.my_sin_addr = client->addr;
-+		tmp_sockaddr.my_sin_port = client->port;
-+		inet_ntop(my_af_inet, &tmp_sockaddr.my_sin_addr, straddr, sizeof(straddr));
- 		lprintf(LOG_WARNING, "maximum number of %d clients reached, kicking out %s:%d\n",
--			MAX_NR_CLIENTS, inet_ntoa(tmp_sockaddr.sin_addr), tmp_sockaddr.sin_port);
-+			MAX_NR_CLIENTS, straddr, tmp_sockaddr.my_sin_port);
- 		close(client->sockfd);
- 	} else {
- 		client = malloc(sizeof (client_t));
-@@ -183,35 +187,38 @@ static void handle_tcp_connect(void)
- 	}
- 
- 	/* Now fill out the client control structure values */
-+	inet_ntop(my_af_inet, &sockaddr.my_sin_addr, straddr, sizeof(straddr));
- 	lprintf(LOG_DEBUG, "connected TCP client %s:%d\n",
--		inet_ntoa(sockaddr.sin_addr), sockaddr.sin_port);
-+		straddr, sockaddr.my_sin_port);
- 	client->timestamp = time(NULL);
- 	client->sockfd = rv;
--	client->addr = sockaddr.sin_addr.s_addr;
--	client->port = sockaddr.sin_port;
-+	client->addr = sockaddr.my_sin_addr;
-+	client->port = sockaddr.my_sin_port;
- 	client->size = 0;
- 	client->outgoing = 0;
- }
- 
- static void handle_tcp_client_write(client_t *client)
- {
--	struct sockaddr_in sockaddr;
-+	struct my_sockaddr_t sockaddr;
- 	int rv;
-+	char straddr[my_inet_addrstrlen];
- 
- 	/* Send the packet atomically and close socket if that did not work */
--	sockaddr.sin_addr.s_addr = client->addr;
--	sockaddr.sin_port = client->port;
-+	sockaddr.my_sin_addr = client->addr;
-+	sockaddr.my_sin_port = client->port;
- 	rv = send(client->sockfd, client->packet, client->size, 0);
-+	inet_ntop(my_af_inet, &sockaddr.my_sin_addr, straddr, sizeof(straddr));
- 	if (rv == -1) {
- 		lprintf(LOG_WARNING, "could not send packet to TCP client %s:%d: %m\n",
--			inet_ntoa(sockaddr.sin_addr), sockaddr.sin_port);
-+			straddr, sockaddr.my_sin_port);
- 		close(client->sockfd);
- 		client->sockfd = -1;
- 		return;
- 	} else if (rv != client->size) {
- 		lprintf(LOG_WARNING, "could not send packet to TCP client %s:%d: "
--			"only %d of %d bytes written\n", inet_ntoa(sockaddr.sin_addr),
--			sockaddr.sin_port, rv, (int) client->size);
-+			"only %d of %d bytes written\n", straddr,
-+			sockaddr.my_sin_port, rv, (int) client->size);
- 		close(client->sockfd);
- 		client->sockfd = -1;
- 		return;
-@@ -227,23 +234,25 @@ static void handle_tcp_client_write(clie
- 
- static void handle_tcp_client_read(client_t *client)
- {
--	struct sockaddr_in sockaddr;
-+	struct my_sockaddr_t sockaddr;
- 	int rv;
-+	char straddr[my_inet_addrstrlen];
- 
- 	/* Read from the socket what arrived and put it into the buffer */
--	sockaddr.sin_addr.s_addr = client->addr;
--	sockaddr.sin_port = client->port;
-+	sockaddr.my_sin_addr = client->addr;
-+	sockaddr.my_sin_port = client->port;
- 	rv = read(client->sockfd, client->packet + client->size,
- 		sizeof (client->packet) - client->size);
-+	inet_ntop(my_af_inet, &sockaddr.my_sin_addr, straddr, sizeof(straddr));
- 	if (rv == -1) {
- 		lprintf(LOG_WARNING, "could not read packet from TCP client %s:%d: %m\n",
--			inet_ntoa(sockaddr.sin_addr), sockaddr.sin_port);
-+			straddr, sockaddr.my_sin_port);
- 		close(client->sockfd);
- 		client->sockfd = -1;
- 		return;
- 	} else if (rv == 0) {
- 		lprintf(LOG_DEBUG, "disconnected TCP client %s:%d\n",
--			inet_ntoa(sockaddr.sin_addr), sockaddr.sin_port);
-+			straddr, sockaddr.my_sin_port);
- 		close(client->sockfd);
- 		client->sockfd = -1;
- 		return;
-@@ -255,7 +264,7 @@ static void handle_tcp_client_read(clien
- 	rv = snmp_packet_complete(client);
- 	if (rv == -1) {
- 		lprintf(LOG_WARNING, "could not handle packet from TCP client %s:%d: %m\n",
--			inet_ntoa(sockaddr.sin_addr), sockaddr.sin_port);
-+			straddr, sockaddr.my_sin_port);
- 		close(client->sockfd);
- 		client->sockfd = -1;
- 		return;
-@@ -270,13 +279,13 @@ static void handle_tcp_client_read(clien
- 	/* Call the protocol handler which will prepare the response packet */
- 	if (snmp(client) == -1) {
- 		lprintf(LOG_WARNING, "could not handle packet from TCP client %s:%d: %m\n",
--			inet_ntoa(sockaddr.sin_addr), sockaddr.sin_port);
-+			straddr, sockaddr.my_sin_port);
- 		close(client->sockfd);
- 		client->sockfd = -1;
- 		return;
- 	} else if (client->size == 0) {
- 		lprintf(LOG_WARNING, "could not handle packet from TCP client %s:%d: ignored\n",
--			inet_ntoa(sockaddr.sin_addr), sockaddr.sin_port);
-+			straddr, sockaddr.my_sin_port);
- 		close(client->sockfd);
- 		client->sockfd = -1;
- 		return;
-@@ -313,7 +322,7 @@ int main(int argc, char *argv[])
- 	int option_index = 1;
- 	int c;
- 
--	struct sockaddr_in sockaddr;
-+	struct my_sockaddr_t sockaddr;
- 	socklen_t socklen;
- 	fd_set rfds;
- 	fd_set wfds;
-@@ -399,14 +408,14 @@ int main(int argc, char *argv[])
- #endif
- 
- 	/* Open the server's UDP port and prepare it for listening */
--	g_udp_sockfd = socket(PF_INET, SOCK_DGRAM, 0);
-+	g_udp_sockfd = socket(my_pf_inet, SOCK_DGRAM, 0);
- 	if (g_udp_sockfd == -1) {
- 		lprintf(LOG_ERR, "could not create UDP socket: %m\n");
- 		exit(EXIT_SYSCALL);
- 	}
--	sockaddr.sin_family = AF_INET;
--	sockaddr.sin_port = htons(g_udp_port);
--	sockaddr.sin_addr.s_addr = INADDR_ANY;
-+	sockaddr.my_sin_family = my_af_inet;
-+	sockaddr.my_sin_port = htons(g_udp_port);
-+	sockaddr.my_sin_addr = my_inaddr_any;
- 	socklen = sizeof (sockaddr);
- 	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);
-@@ -414,7 +423,7 @@ int main(int argc, char *argv[])
- 	}
- 
- 	/* Open the server's TCP port and prepare it for listening */
--	g_tcp_sockfd = socket(PF_INET, SOCK_STREAM, 0);
-+	g_tcp_sockfd = socket(my_pf_inet, SOCK_STREAM, 0);
- 	if (g_tcp_sockfd == -1) {
- 		lprintf(LOG_ERR, "could not create TCP socket: %m\n");
- 		exit(EXIT_SYSCALL);
-@@ -424,9 +433,9 @@ int main(int argc, char *argv[])
- 		lprintf(LOG_WARNING, "could not set SO_REUSEADDR on TCP socket: %m\n");
- 		exit(EXIT_SYSCALL);
- 	}
--	sockaddr.sin_family = AF_INET;
--	sockaddr.sin_port = htons(g_tcp_port);
--	sockaddr.sin_addr.s_addr = INADDR_ANY;
-+	sockaddr.my_sin_family = my_af_inet;
-+	sockaddr.my_sin_port = htons(g_tcp_port);
-+	sockaddr.my_sin_addr = my_inaddr_any;
- 	socklen = sizeof (sockaddr);
- 	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);
---- a/mini_snmpd.h
-+++ b/mini_snmpd.h
-@@ -120,6 +120,27 @@
- 	} while (0)
- #endif
- 
-+#ifdef IPV6
-+#define my_sockaddr_t		sockaddr_in6
-+#define my_sin_addr		sin6_addr
-+#define my_sin_port		sin6_port
-+#define my_sin_family		sin6_family
-+#define my_af_inet		AF_INET6
-+#define my_pf_inet		PF_INET6
-+#define my_in_addr_t		in6_addr
-+#define my_inaddr_any		in6addr_any
-+#define my_inet_addrstrlen	INET6_ADDRSTRLEN
-+#else
-+#define my_sockaddr_t		sockaddr_in
-+#define my_sin_addr		sin_addr
-+#define my_sin_port		sin_port
-+#define my_sin_family		sin_family
-+#define my_af_inet		AF_INET
-+#define my_pf_inet		PF_INET
-+#define my_in_addr_t		in_addr
-+#define my_inaddr_any		inaddr_any
-+#define my_inet_addrstrlen	INET_ADDRSTRLEN
-+#endif
- 
- 
- /* -----------------------------------------------------------------------------
-@@ -129,7 +150,7 @@
- typedef struct client_s {
- 	time_t timestamp;
- 	int sockfd;
--	in_addr_t addr;
-+	struct my_in_addr_t addr;
- 	in_port_t port;
- 	unsigned char packet[MAX_PACKET_SIZE];
- 	size_t size;
-@@ -236,6 +257,9 @@ extern char *g_description;
- extern char *g_vendor;
- extern char *g_location;
- extern char *g_contact;
-+#ifndef IPV6
-+extern const struct in_addr inaddr_any;
-+#endif
- extern char *g_disk_list[MAX_NR_DISKS];
- extern int g_disk_list_length;
- extern char *g_interface_list[MAX_NR_INTERFACES];
---- a/utils.c
-+++ b/utils.c
-@@ -91,12 +91,13 @@ void read_values(const char *buffer, con
- 
- void dump_packet(const client_t *client)
- {
--	struct in_addr client_addr;
-+	struct my_in_addr_t client_addr;
-+	char straddr[my_inet_addrstrlen];
- 	char buffer[BUFSIZ];
- 	int len;
- 	int i;
- 
--	client_addr.s_addr = client->addr;
-+	client_addr = client->addr;
- 	len = 0;
- 	for (i = 0; i < client->size; i++) {
- 		len += snprintf(buffer + len, sizeof (buffer) - len,
-@@ -105,9 +106,10 @@ void dump_packet(const client_t *client)
- 			break;
- 		}
- 	}
-+	inet_ntop(my_af_inet, &client_addr, straddr, sizeof(straddr));
- 	lprintf(LOG_DEBUG, "%s %u bytes %s %s:%d (%s)\n",
- 		client->outgoing ? "transmitted" : "received", (int) client->size,
--		client->outgoing ? "to" : "from", inet_ntoa(client_addr),
-+		client->outgoing ? "to" : "from", straddr,
- 		ntohs(client->port), buffer);
- }
-