Date: Mon, 18 Aug 2014 18:33:40 GMT From: shonali@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r272636 - soc2014/shonali/head/contrib/bsnmp/snmpd Message-ID: <201408181833.s7IIXeVq016241@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: shonali Date: Mon Aug 18 18:33:39 2014 New Revision: 272636 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272636 Log: Whitespace corrections Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/main.c soc2014/shonali/head/contrib/bsnmp/snmpd/snmpmod.h soc2014/shonali/head/contrib/bsnmp/snmpd/trap.c soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/main.c ============================================================================== --- soc2014/shonali/head/contrib/bsnmp/snmpd/main.c Mon Aug 18 18:32:21 2014 (r272635) +++ soc2014/shonali/head/contrib/bsnmp/snmpd/main.c Mon Aug 18 18:33:39 2014 (r272636) @@ -1647,8 +1647,8 @@ syslog(LOG_WARNING, "cannot start UDP transport"); if (lsock_trans.start() != SNMP_ERR_NOERROR) syslog(LOG_WARNING, "cannot start LSOCK transport"); - if (udpv6_trans.start() != SNMP_ERR_NOERROR) - syslog(LOG_WARNING, "cannot start UDPv6 transport"); + if (udpv6_trans.start() != SNMP_ERR_NOERROR) + syslog(LOG_WARNING, "cannot start UDPv6 transport"); #ifdef USE_LIBBEGEMOT if (debug.evdebug > 0) Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/snmpmod.h ============================================================================== --- soc2014/shonali/head/contrib/bsnmp/snmpd/snmpmod.h Mon Aug 18 18:32:21 2014 (r272635) +++ soc2014/shonali/head/contrib/bsnmp/snmpd/snmpmod.h Mon Aug 18 18:33:39 2014 (r272636) @@ -471,7 +471,7 @@ }; #define SNMP_UDP_ADDR_SIZ 6 -#define SNMP_UDP_ADDRv6_SIZ 18 +#define SNMP_UDP_ADDRv6_SIZ 18 #define SNMP_TAG_SIZ (255 + 1) enum target_domain { @@ -481,11 +481,11 @@ struct target_address { char name[SNMP_ADM_STR32_SIZ]; - enum target_domain domain; - union address { + enum target_domain domain; + union address { uint8_t address[SNMP_UDP_ADDR_SIZ]; - uint8_t address6[SNMP_UDP_ADDRv6_SIZ]; - }address; + uint8_t address6[SNMP_UDP_ADDRv6_SIZ]; + }address; int32_t timeout; int32_t retry; char taglist[SNMP_TAG_SIZ]; Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/trap.c ============================================================================== --- soc2014/shonali/head/contrib/bsnmp/snmpd/trap.c Mon Aug 18 18:32:21 2014 (r272635) +++ soc2014/shonali/head/contrib/bsnmp/snmpd/trap.c Mon Aug 18 18:33:39 2014 (r272636) @@ -57,7 +57,6 @@ #include "tree.h" #include "oid.h" - struct trapsink_list trapsink_list = TAILQ_HEAD_INITIALIZER(trapsink_list); /* List of target addresses */ @@ -117,17 +116,17 @@ t->version = TRAPSINK_V2; switch (t->index.len) { - case SNMP_UDP_ADDR_SIZ: - trapsink_create_sock(t); + case SNMP_UDP_ADDR_SIZ: + trapsink_create_sock(t); break; - case SNMP_UDP_ADDRv6_SIZ: + case SNMP_UDP_ADDRv6_SIZ: trapsink_create_sockv6(t); break; - default: - return (SNMP_ERR_WRONG_LENGTH); - } + default: + return (SNMP_ERR_WRONG_LENGTH); + } if (tdep->set & TDEP_VERSION) t->version = tdep->version; @@ -368,7 +367,7 @@ break; case SNMP_OP_SET: - /* XX - Check, if reqd add ipv6 support for ipa */ + /* XX - Check if ipv6 support required for ipa */ if (index_decode(&value->var, sub, iidx, ipa, &port) || port == 0 || port > 65535) return (SNMP_ERR_NO_CREATION); @@ -441,13 +440,13 @@ case LEAF_begemotTrapSinkAddrType: if (tdep->set & TDEP_ADDRTYPE) - return (SNMP_ERR_INCONS_VALUE); - if (value->v.integer != TRAPSINK_IPv4 && + return (SNMP_ERR_INCONS_VALUE); + if (value->v.integer != TRAPSINK_IPv4 && value->v.integer != TRAPSINK_IPv6) - return (SNMP_ERR_WRONG_VALUE); - tdep->addrtype = value->v.integer; - tdep->set |= TDEP_ADDRTYPE; - return (SNMP_ERR_NOERROR); + return (SNMP_ERR_WRONG_VALUE); + tdep->addrtype = value->v.integer; + tdep->set |= TDEP_ADDRTYPE; + return (SNMP_ERR_NOERROR); } if (t == NULL) return (SNMP_ERR_INCONS_NAME); @@ -805,51 +804,51 @@ int target_activate_address(struct target_address *addrs) { - struct sockaddr_in sa; - struct sockaddr_in6 sa6; + struct sockaddr_in sa; + struct sockaddr_in6 sa6; switch (addrs->domain) { case TransportAddressIPv4 : if ((addrs->socket = socket(PF_INET, SOCK_DGRAM, 0)) == -1) { - syslog(LOG_ERR, "socket(UDP): %m"); - return (SNMP_ERR_RES_UNAVAIL); - } - - (void)shutdown(addrs->socket, SHUT_RD); - memset(&sa, 0, sizeof(sa)); - sa.sin_len = sizeof(sa); - sa.sin_family = AF_INET; + syslog(LOG_ERR, "socket(UDP): %m"); + return (SNMP_ERR_RES_UNAVAIL); + } + + (void)shutdown(addrs->socket, SHUT_RD); + memset(&sa, 0, sizeof(sa)); + sa.sin_len = sizeof(sa); + sa.sin_family = AF_INET; sa.sin_addr.s_addr = htonl((addrs->address.address[0] << 24) | - (addrs->address.address[1] << 16) | (addrs->address.address[2] << 8) | - (addrs->address.address[3] << 0)); - sa.sin_port = htons(addrs->address.address[4]) << 8 | - htons(addrs->address.address[5]) << 0; + (addrs->address.address[1] << 16) | (addrs->address.address[2] << 8) | + (addrs->address.address[3] << 0)); + sa.sin_port = htons(addrs->address.address[4]) << 8 | + htons(addrs->address.address[5]) << 0; if (connect(addrs->socket, (struct sockaddr *)&sa, sa.sin_len) == -1) { - syslog(LOG_ERR, "connect(%s,%u): %m", - inet_ntoa(sa.sin_addr), ntohs(sa.sin_port)); - (void)close(addrs->socket); - return (SNMP_ERR_GENERR); + syslog(LOG_ERR, "connect(%s,%u): %m", + inet_ntoa(sa.sin_addr), ntohs(sa.sin_port)); + (void)close(addrs->socket); + return (SNMP_ERR_GENERR); } break; - case TransportAddressIPv6 : + case TransportAddressIPv6 : if ((addrs->socket = socket(PF_INET6, SOCK_DGRAM, 0)) == -1) { - syslog(LOG_ERR, "socket(UDP): %m"); - return (SNMP_ERR_RES_UNAVAIL); - } + syslog(LOG_ERR, "socket(UDP): %m"); + return (SNMP_ERR_RES_UNAVAIL); + } - (void)shutdown(addrs->socket, SHUT_RD); + (void)shutdown(addrs->socket, SHUT_RD); memset(&sa6, 0, sizeof(sa6)); sa6.sin6_len = sizeof(sa6); sa6.sin6_family = AF_INET6; inet_pton(AF_INET6, &(addrs->address.address6), &(sa6.sin6_addr.s6_addr)); sa6.sin6_port = htons(addrs->address.address6[16]) << 8 | htons(addrs->address.address6[17]) << 0; - char dst[INET6_ADDRSTRLEN]; - inet_ntop(AF_INET6,&(sa6.sin6_addr), dst, INET6_ADDRSTRLEN); + char dst[INET6_ADDRSTRLEN]; + inet_ntop(AF_INET6,&(sa6.sin6_addr), dst, INET6_ADDRSTRLEN); if (connect(addrs->socket, (struct sockaddr *)&sa6, sa6.sin6_len) == -1) { syslog(LOG_ERR, "connect(%s,%u): %m", dst, ntohs(sa6.sin6_port)); (void)close(addrs->socket); @@ -857,10 +856,9 @@ } break; - default: - return (SNMP_ERR_BADVALUE); - } - + default: + return (SNMP_ERR_BADVALUE); + } addrs->status = RowStatus_active; Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def ============================================================================== --- soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def Mon Aug 18 18:32:21 2014 (r272635) +++ soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def Mon Aug 18 18:33:39 2014 (r272636) @@ -125,7 +125,7 @@ (3 begemotTrapSinkStatus INTEGER GET SET) (4 begemotTrapSinkComm OCTETSTRING GET SET) (5 begemotTrapSinkVersion INTEGER GET SET) - (6 begemotTrapSinkAddrType InetAddressType GET SET) + (6 begemotTrapSinkAddrType InetAddressType GET SET) ) ) #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408181833.s7IIXeVq016241>