socsvn commit: r268922 - soc2014/shonali/head/contrib/bsnmp/snmpd

shonali at FreeBSD.org shonali at FreeBSD.org
Sun Jun 1 18:14:49 UTC 2014


Author: shonali
Date: Sun Jun  1 18:14:48 2014
New Revision: 268922
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268922

Log:
  Created a transport file for ipv6 and started making the ipv6 implementation changes to udp_init_port()
  

Added:
  soc2014/shonali/head/contrib/bsnmp/snmpd/trans_udp_ipv6.c

Added: soc2014/shonali/head/contrib/bsnmp/snmpd/trans_udp_ipv6.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/trans_udp_ipv6.c	Sun Jun  1 18:14:48 2014	(r268922)
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2003
+ *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
+ *	All rights reserved.
+ *
+ * Author: Harti Brandt <harti at freebsd.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.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Begemot: bsnmp/snmpd/trans_udp.c,v 1.5 2005/10/04 08:46:56 brandt_h Exp $
+ *
+ * UDP transport
+ */
+#include <sys/types.h>
+#include <sys/queue.h>
+
+#include <stdlib.h>
+#include <syslog.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include "snmpmod.h"
+#include "snmpd.h"
+#include "trans_udp.h"
+#include "tree.h"
+#include "oid.h"
+
+static int udp_start(void);
+static int udp_stop(int);
+static void udp_close_port(struct tport *);
+static int udp_init_port(struct tport *);
+static ssize_t udp_send(struct tport *, const u_char *, size_t,
+    const struct sockaddr *, size_t);
+
+/* exported */
+const struct transport_def udp_trans = {
+	"udp",
+	OIDX_begemotSnmpdTransUdp,
+	udp_start,
+	udp_stop,
+	udp_close_port,
+	udp_init_port,
+	udp_send
+};
+static struct transport *my_trans;
+
+static int
+udp_start(void)
+{
+	return (trans_register(&udp_trans, &my_trans));
+}
+
+static int
+udp_stop(int force __unused)
+{
+	if (my_trans != NULL)
+		if (trans_unregister(my_trans) != 0)
+			return (SNMP_ERR_GENERR);
+	return (SNMP_ERR_NOERROR);
+}
+
+/*
+ * A UDP port is ready
+ */
+static void
+udp_input(int fd __unused, void *udata)
+{
+	struct udp_port *p = udata;
+
+	p->input.peerlen = sizeof(p->ret);
+	snmpd_input(&p->input, &p->tport);
+}
+
+/*
+ * Create a UDP socket and bind it to the given port
+ */
+static int
+udp_init_port(struct tport *tp)
+{
+	struct udp_port *p = (struct udp_port *)tp;
+	struct sockaddr_in6 addr;
+	u_int32_t ip;
+	const int on = 1;
+        char str[INET6_ADDRSTRLEN];
+
+	if ((p->input.fd = socket(PF_INET6, SOCK_DGRAM, 0)) < 0) {
+		syslog(LOG_ERR, "creating UDP socket: %m");
+		return (SNMP_ERR_RES_UNAVAIL);
+	}
+
+        /* Need to check - modify ip so as to store ipv6 */ 
+	ip = (p->addr[0] << 24) | (p->addr[1] << 16) | (p->addr[2] << 8) |
+	    p->addr[3];
+	memset(&addr, 0, sizeof(addr));
+	addr.sin6_addr.s_addr = htonl(ip);
+	addr.sin6_port = htons(p->port);
+	addr.sin6_family = AF_INET6;
+	addr.sin_len = sizeof(addr);
+	if (addr.sin6_addr.s_addr == IN6ADDR_ANY && 
+	    setsockopt(p->input.fd, IPPROTO_IPV6, IPV6_V6ONLY, &on,
+	    sizeof(on)) == -1) {
+		syslog(LOG_ERR, "setsockopt(IP_RECVDSTADDR): %m");
+		close(p->input.fd);
+		p->input.fd = -1;
+		return (SNMP_ERR_GENERR);
+	}
+	if (bind(p->input.fd, (struct sockaddr *)&addr, sizeof(addr))) {
+		if (errno == EADDRNOTAVAIL) {
+			close(p->input.fd);
+			p->input.fd = -1;
+			return (SNMP_ERR_INCONS_NAME);
+		}
+                inet_ntop(AF_INET6, &(addr.sin_addr), str, INET6_ADDRSTRLEN)
+		syslog(LOG_ERR, "bind: %s:%u %m", str, 
+		    p->port);
+		close(p->input.fd);
+		p->input.fd = -1;
+		return (SNMP_ERR_GENERR);
+	}
+	if ((p->input.id = fd_select(p->input.fd, udp_input,
+	    p, NULL)) == NULL) {
+		close(p->input.fd);
+		p->input.fd = -1;
+		return (SNMP_ERR_GENERR);
+	}
+	return (SNMP_ERR_NOERROR);
+}
+
+/*
+ * Create a new SNMP Port object and start it, if we are not
+ * in initialization mode. The arguments are in host byte order.
+ */
+static int
+udp_open_port(u_int8_t *addr, u_int32_t udp_port, struct udp_port **pp)
+{
+	struct udp_port *port;
+	int err;
+
+	if (udp_port > 0xffff)
+		return (SNMP_ERR_NO_CREATION);
+	if ((port = malloc(sizeof(*port))) == NULL)
+		return (SNMP_ERR_GENERR);
+	memset(port, 0, sizeof(*port));
+
+	/* initialize common part */
+	port->tport.index.len = 5;
+	port->tport.index.subs[0] = addr[0];
+	port->tport.index.subs[1] = addr[1];
+	port->tport.index.subs[2] = addr[2];
+	port->tport.index.subs[3] = addr[3];
+	port->tport.index.subs[4] = udp_port;
+
+	port->addr[0] = addr[0];
+	port->addr[1] = addr[1];
+	port->addr[2] = addr[2];
+	port->addr[3] = addr[3];
+	port->port = udp_port;
+
+	port->input.fd = -1;
+	port->input.id = NULL;
+	port->input.stream = 0;
+	port->input.cred = 0;
+	port->input.peer = (struct sockaddr *)&port->ret;
+	port->input.peerlen = sizeof(port->ret);
+
+	trans_insert_port(my_trans, &port->tport);
+
+	if (community != COMM_INITIALIZE &&
+	    (err = udp_init_port(&port->tport)) != SNMP_ERR_NOERROR) {
+		udp_close_port(&port->tport);
+		return (err);
+	}
+	*pp = port;
+	return (SNMP_ERR_NOERROR);
+}
+
+/*
+ * Close an SNMP port
+ */
+static void
+udp_close_port(struct tport *tp)
+{
+	struct udp_port *port = (struct udp_port *)tp;
+
+	snmpd_input_close(&port->input);
+	trans_remove_port(tp);
+	free(port);
+}
+
+/*
+ * Send something
+ */
+static ssize_t
+udp_send(struct tport *tp, const u_char *buf, size_t len,
+    const struct sockaddr *addr, size_t addrlen)
+{
+	struct udp_port *p = (struct udp_port *)tp;
+
+	return (sendto(p->input.fd, buf, len, 0, addr, addrlen));
+}
+
+/*
+ * Port table
+ */
+int
+op_snmp_port(struct snmp_context *ctx, struct snmp_value *value,
+    u_int sub, u_int iidx, enum snmp_op op)
+{
+	asn_subid_t which = value->var.subs[sub-1];
+	struct udp_port *p;
+	u_int8_t addr[4];
+	u_int32_t port;
+
+	switch (op) {
+
+	  case SNMP_OP_GETNEXT:
+		if ((p = (struct udp_port *)trans_next_port(my_trans,
+		    &value->var, sub)) == NULL)
+			return (SNMP_ERR_NOSUCHNAME);
+		index_append(&value->var, sub, &p->tport.index);
+		break;
+
+	  case SNMP_OP_GET:
+		if ((p = (struct udp_port *)trans_find_port(my_trans,
+		    &value->var, sub)) == NULL)
+			return (SNMP_ERR_NOSUCHNAME);
+		break;
+
+	  case SNMP_OP_SET:
+		p = (struct udp_port *)trans_find_port(my_trans,
+		    &value->var, sub);
+		ctx->scratch->int1 = (p != NULL);
+
+		if (which != LEAF_begemotSnmpdPortStatus)
+			abort();
+		if (!TRUTH_OK(value->v.integer))
+			return (SNMP_ERR_WRONG_VALUE);
+
+		ctx->scratch->int2 = TRUTH_GET(value->v.integer);
+
+		if (ctx->scratch->int2) {
+			/* open an SNMP port */
+			if (p != NULL)
+				/* already open - do nothing */
+				return (SNMP_ERR_NOERROR);
+
+			if (index_decode(&value->var, sub, iidx, addr, &port))
+				return (SNMP_ERR_NO_CREATION);
+			return (udp_open_port(addr, port, &p));
+
+		} else {
+			/* close SNMP port - do in commit */
+		}
+		return (SNMP_ERR_NOERROR);
+
+	  case SNMP_OP_ROLLBACK:
+		p = (struct udp_port *)trans_find_port(my_trans,
+		    &value->var, sub);
+		if (ctx->scratch->int1 == 0) {
+			/* did not exist */
+			if (ctx->scratch->int2 == 1) {
+				/* created */
+				if (p != NULL)
+					udp_close_port(&p->tport);
+			}
+		}
+		return (SNMP_ERR_NOERROR);
+
+	  case SNMP_OP_COMMIT:
+		p = (struct udp_port *)trans_find_port(my_trans,
+		    &value->var, sub);
+		if (ctx->scratch->int1 == 1) {
+			/* did exist */
+			if (ctx->scratch->int2 == 0) {
+				/* delete */
+				if (p != NULL)
+					udp_close_port(&p->tport);
+			}
+		}
+		return (SNMP_ERR_NOERROR);
+
+	  default:
+		abort();
+	}
+
+	/*
+	 * Come here to fetch the value
+	 */
+	switch (which) {
+
+	  case LEAF_begemotSnmpdPortStatus:
+		value->v.integer = 1;
+		break;
+
+	  default:
+		abort();
+	}
+
+	return (SNMP_ERR_NOERROR);
+}


More information about the svn-soc-all mailing list