/*
- * DEBUG: section 49 SNMP support
- * AUTHOR: Glenn Chisholm
- *
- * SQUID Web Proxy Cache http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- * Squid is the result of efforts by numerous individuals from
- * the Internet community; see the CONTRIBUTORS file for full
- * details. Many organizations have provided support for Squid's
- * development; see the SPONSORS file for full details. Squid is
- * Copyrighted (C) 2001 by the Regents of the University of
- * California; see the COPYRIGHT file for full details. Squid
- * incorporates software developed and/or copyrighted by other
- * sources; see the CREDITS file for full details.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ * Copyright (C) 1996-2018 The Squid Software Foundation and contributors
*
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
*/
+
+/* DEBUG: section 49 SNMP support */
+
#include "squid.h"
#include "acl/FilledChecklist.h"
#include "base/CbcPointer.h"
+#include "CachePeer.h"
+#include "client_db.h"
#include "comm.h"
#include "comm/Connection.h"
#include "comm/Loops.h"
-#include "ipc/StartListening.h"
+#include "comm/UdpOpenDialer.h"
+#include "fatal.h"
#include "ip/Address.h"
#include "ip/tools.h"
-#include "snmp_core.h"
#include "snmp/Forwarder.h"
-
-
-/// dials snmpConnectionOpened call
-class SnmpListeningStartedDialer: public CallDialer,
- public Ipc::StartListeningCb
-{
-public:
- typedef void (*Handler)(const Comm::ConnectionPointer &conn, int errNo);
- SnmpListeningStartedDialer(Handler aHandler): handler(aHandler) {}
-
- virtual void print(std::ostream &os) const { startPrint(os) << ')'; }
-
- virtual bool canDial(AsyncCall &) const { return true; }
- virtual void dial(AsyncCall &) { (handler)(conn, errNo); }
-
-public:
- Handler handler;
-};
-
+#include "snmp_agent.h"
+#include "snmp_core.h"
+#include "SnmpRequest.h"
+#include "SquidConfig.h"
+#include "tools.h"
static void snmpPortOpened(const Comm::ConnectionPointer &conn, int errNo);
-
mib_tree_entry *mib_tree_head;
mib_tree_entry *mib_tree_last;
static mib_tree_entry *snmpAddNode(oid * name, int len, oid_ParseFn * parsefunction, instance_Fn * instancefunction, AggrType aggrType, int children,...);
static oid *snmpCreateOid(int length,...);
mib_tree_entry * snmpLookupNodeStr(mib_tree_entry *entry, const char *str);
-int snmpCreateOidFromStr(const char *str, oid **name, int *nl);
+bool snmpCreateOidFromStr(const char *str, oid **name, int *nl);
SQUIDCEXTERN void (*snmplib_debug_hook) (int, char *);
static oid *static_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);
static oid *time_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);
static oid *peer_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);
static oid *client_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);
-static void snmpDecodePacket(snmp_request_t * rq);
-static void snmpConstructReponse(snmp_request_t * rq);
+static void snmpDecodePacket(SnmpRequest * rq);
+static void snmpConstructReponse(SnmpRequest * rq);
static oid_ParseFn *snmpTreeNext(oid * Current, snint CurrentLen, oid ** Next, snint * NextLen);
static oid_ParseFn *snmpTreeGet(oid * Current, snint CurrentLen);
snmpAddNodeStr("1.3.6.1.4.1.3495.1.4.2", FQDN_GHBN, snmp_netFqdnFn, static_Inst, atSum);
snmpAddNodeStr("1.3.6.1.4.1.3495.1.4", NET_DNS_CACHE, NULL, NULL);
-#if USE_DNSSERVERS
snmpAddNodeStr("1.3.6.1.4.1.3495.1.4.3", DNS_REQ, snmp_netDnsFn, static_Inst, atSum);
snmpAddNodeStr("1.3.6.1.4.1.3495.1.4.3", DNS_REP, snmp_netDnsFn, static_Inst, atSum);
snmpAddNodeStr("1.3.6.1.4.1.3495.1.4.3", DNS_SERVERS, snmp_netDnsFn, static_Inst, atSum);
-#else
- snmpAddNodeStr("1.3.6.1.4.1.3495.1.4.3", DNS_REQ, snmp_netIdnsFn, static_Inst, atSum);
- snmpAddNodeStr("1.3.6.1.4.1.3495.1.4.3", DNS_REP, snmp_netIdnsFn, static_Inst, atSum);
- snmpAddNodeStr("1.3.6.1.4.1.3495.1.4.3", DNS_SERVERS, snmp_netIdnsFn, static_Inst, atSum);
-#endif
/* SQ_MESH - 1.3.6.1.4.1.3495.1.5 */
snmpAddNodeStr("1.3.6.1.4.1.3495.1", 5, NULL, NULL);
}
void
-snmpConnectionOpen(void)
+snmpOpenPorts(void)
{
debugs(49, 5, "snmpConnectionOpen: Called");
snmpIncomingConn = new Comm::Connection;
snmpIncomingConn->local = Config.Addrs.snmp_incoming;
- snmpIncomingConn->local.SetPort(Config.Port.snmp);
+ snmpIncomingConn->local.port(Config.Port.snmp);
- if (!Ip::EnableIpv6 && !snmpIncomingConn->local.SetIPv4()) {
+ if (!Ip::EnableIpv6 && !snmpIncomingConn->local.setIPv4()) {
debugs(49, DBG_CRITICAL, "ERROR: IPv6 is disabled. " << snmpIncomingConn->local << " is not an IPv4 address.");
fatal("SNMP port cannot be opened.");
}
/* split-stack for now requires IPv4-only SNMP */
- if (Ip::EnableIpv6&IPV6_SPECIAL_SPLITSTACK && snmpIncomingConn->local.IsAnyAddr()) {
- snmpIncomingConn->local.SetIPv4();
+ if (Ip::EnableIpv6&IPV6_SPECIAL_SPLITSTACK && snmpIncomingConn->local.isAnyAddr()) {
+ snmpIncomingConn->local.setIPv4();
}
AsyncCall::Pointer call = asyncCall(49, 2, "snmpIncomingConnectionOpened",
- SnmpListeningStartedDialer(&snmpPortOpened));
+ Comm::UdpOpenDialer(&snmpPortOpened));
Ipc::StartListening(SOCK_DGRAM, IPPROTO_UDP, snmpIncomingConn, Ipc::fdnInSnmpSocket, call);
- if (!Config.Addrs.snmp_outgoing.IsNoAddr()) {
+ if (!Config.Addrs.snmp_outgoing.isNoAddr()) {
snmpOutgoingConn = new Comm::Connection;
snmpOutgoingConn->local = Config.Addrs.snmp_outgoing;
- snmpOutgoingConn->local.SetPort(Config.Port.snmp);
+ snmpOutgoingConn->local.port(Config.Port.snmp);
- if (!Ip::EnableIpv6 && !snmpOutgoingConn->local.SetIPv4()) {
+ if (!Ip::EnableIpv6 && !snmpOutgoingConn->local.setIPv4()) {
debugs(49, DBG_CRITICAL, "ERROR: IPv6 is disabled. " << snmpOutgoingConn->local << " is not an IPv4 address.");
fatal("SNMP port cannot be opened.");
}
/* split-stack for now requires IPv4-only SNMP */
- if (Ip::EnableIpv6&IPV6_SPECIAL_SPLITSTACK && snmpOutgoingConn->local.IsAnyAddr()) {
- snmpOutgoingConn->local.SetIPv4();
+ if (Ip::EnableIpv6&IPV6_SPECIAL_SPLITSTACK && snmpOutgoingConn->local.isAnyAddr()) {
+ snmpOutgoingConn->local.setIPv4();
}
- AsyncCall::Pointer call = asyncCall(49, 2, "snmpOutgoingConnectionOpened",
- SnmpListeningStartedDialer(&snmpPortOpened));
- Ipc::StartListening(SOCK_DGRAM, IPPROTO_UDP, snmpOutgoingConn, Ipc::fdnOutSnmpSocket, call);
+ AsyncCall::Pointer c = asyncCall(49, 2, "snmpOutgoingConnectionOpened",
+ Comm::UdpOpenDialer(&snmpPortOpened));
+ Ipc::StartListening(SOCK_DGRAM, IPPROTO_UDP, snmpOutgoingConn, Ipc::fdnOutSnmpSocket, c);
} else {
snmpOutgoingConn = snmpIncomingConn;
debugs(1, DBG_IMPORTANT, "Sending SNMP messages from " << snmpOutgoingConn->local);
}
static void
-snmpPortOpened(const Comm::ConnectionPointer &conn, int errNo)
+snmpPortOpened(const Comm::ConnectionPointer &conn, int)
{
if (!Comm::IsConnOpen(conn))
fatalf("Cannot open SNMP %s Port",(conn->fd == snmpIncomingConn->fd?"receiving":"sending"));
else if (conn->fd == snmpOutgoingConn->fd)
debugs(1, DBG_IMPORTANT, "Sending SNMP messages from " << snmpOutgoingConn->local);
else
- fatalf("Lost SNMP port (%d) on FD %d", (int)conn->local.GetPort(), conn->fd);
+ fatalf("Lost SNMP port (%d) on FD %d", (int)conn->local.port(), conn->fd);
}
void
-snmpConnectionClose(void)
+snmpClosePorts(void)
{
- if (!Comm::IsConnOpen(snmpIncomingConn)) {
+ if (Comm::IsConnOpen(snmpIncomingConn)) {
debugs(49, DBG_IMPORTANT, "Closing SNMP receiving port " << snmpIncomingConn->local);
snmpIncomingConn->close();
}
snmpIncomingConn = NULL;
- if (!Comm::IsConnOpen(snmpOutgoingConn) && snmpIncomingConn != snmpOutgoingConn) {
+ if (Comm::IsConnOpen(snmpOutgoingConn) && snmpIncomingConn != snmpOutgoingConn) {
// Perform OUT port closure so as not to step on IN port when sharing a conn.
debugs(49, DBG_IMPORTANT, "Closing SNMP sending port " << snmpOutgoingConn->local);
snmpOutgoingConn->close();
* Accept the UDP packet
*/
void
-snmpHandleUdp(int sock, void *not_used)
+snmpHandleUdp(int sock, void *)
{
- LOCAL_ARRAY(char, buf, SNMP_REQUEST_SIZE);
+ static char buf[SNMP_REQUEST_SIZE];
Ip::Address from;
- snmp_request_t *snmp_rq;
+ SnmpRequest *snmp_rq;
int len;
debugs(49, 5, "snmpHandleUdp: Called.");
Comm::SetSelect(sock, COMM_SELECT_READ, snmpHandleUdp, NULL, 0);
- memset(buf, '\0', SNMP_REQUEST_SIZE);
+ memset(buf, '\0', sizeof(buf));
- len = comm_udp_recvfrom(sock,
- buf,
- SNMP_REQUEST_SIZE,
- 0,
- from);
+ len = comm_udp_recvfrom(sock, buf, sizeof(buf)-1, 0, from);
if (len > 0) {
- buf[len] = '\0';
debugs(49, 3, "snmpHandleUdp: FD " << sock << ": received " << len << " bytes from " << from << ".");
- snmp_rq = (snmp_request_t *)xcalloc(1, sizeof(snmp_request_t));
+ snmp_rq = (SnmpRequest *)xcalloc(1, sizeof(SnmpRequest));
snmp_rq->buf = (u_char *) buf;
snmp_rq->len = len;
snmp_rq->sock = sock;
xfree(snmp_rq->outbuf);
xfree(snmp_rq);
} else {
- debugs(49, 1, "snmpHandleUdp: FD " << sock << " recvfrom: " << xstrerror());
+ int xerrno = errno;
+ debugs(49, DBG_IMPORTANT, "snmpHandleUdp: FD " << sock << " recvfrom: " << xstrerr(xerrno));
}
}
* Turn SNMP packet into a PDU, check available ACL's
*/
static void
-snmpDecodePacket(snmp_request_t * rq)
+snmpDecodePacket(SnmpRequest * rq)
{
struct snmp_pdu *PDU;
u_char *Community;
u_char *buf = rq->buf;
int len = rq->len;
- allow_t allow = ACCESS_DENIED;
if (!Config.accessList.snmp) {
debugs(49, DBG_IMPORTANT, "WARNING: snmp_access not configured. agent query DENIED from : " << rq->from);
ACLFilledChecklist checklist(Config.accessList.snmp, NULL, NULL);
checklist.src_addr = rq->from;
checklist.snmp_community = (char *) Community;
- allow = checklist.fastCheck();
- if (allow == ACCESS_ALLOWED && (snmp_coexist_V2toV1(PDU))) {
+ if (checklist.fastCheck().allowed() && (snmp_coexist_V2toV1(PDU))) {
rq->community = Community;
rq->PDU = PDU;
debugs(49, 5, "snmpAgentParse: reqid=[" << PDU->reqid << "]");
* Packet OK, ACL Check OK, Create reponse.
*/
static void
-snmpConstructReponse(snmp_request_t * rq)
+snmpConstructReponse(SnmpRequest * rq)
{
struct snmp_pdu *RespPDU;
oid *NextOidName = NULL;
snint NextOidNameLen = 0;
- index++;
+ ++index;
if (get_next)
ParseFn = snmpTreeNext(VarPtr->name, VarPtr->name_length, &NextOidName, &NextOidNameLen);
mibTreeEntry = mib_tree_head;
if (Current[count] == mibTreeEntry->name[count]) {
- count++;
+ ++count;
while ((mibTreeEntry) && (count < CurrentLen) && (!mibTreeEntry->parsefunction)) {
mibTreeEntry = snmpTreeEntry(Current[count], count, mibTreeEntry);
- count++;
+ ++count;
}
}
int count = 0;
if (Current[count] == mibTreeEntry->name[count]) {
- count++;
+ ++count;
while (mibTreeEntry != NULL && count < CurrentLen) {
mibTreeEntry = snmpTreeEntry(Current[count], count, mibTreeEntry);
if (mibTreeEntry != NULL)
type = mibTreeEntry->aggrType;
- count++;
+ ++count;
}
}
snmpTreeNext(oid * Current, snint CurrentLen, oid ** Next, snint * NextLen)
{
oid_ParseFn *Fn = NULL;
- mib_tree_entry *mibTreeEntry = NULL, *nextoid = NULL;
int count = 0;
debugs(49, 5, "snmpTreeNext: Called");
MemBuf tmp;
debugs(49, 6, "snmpTreeNext: Current : " << snmpDebugOid(Current, CurrentLen, tmp));
- mibTreeEntry = mib_tree_head;
+ mib_tree_entry *mibTreeEntry = mib_tree_head;
- if (Current[count] == mibTreeEntry->name[count]) {
- count++;
+ if (mibTreeEntry && Current[count] == mibTreeEntry->name[count]) {
+ ++count;
while ((mibTreeEntry) && (count < CurrentLen) && (!mibTreeEntry->parsefunction)) {
mib_tree_entry *nextmibTreeEntry = snmpTreeEntry(Current[count], count, mibTreeEntry);
else
mibTreeEntry = nextmibTreeEntry;
- count++;
+ ++count;
}
debugs(49, 5, "snmpTreeNext: Recursed down to requested object");
} else {
if (mibTreeEntry == mib_tree_last)
return (Fn);
-
if ((mibTreeEntry) && (mibTreeEntry->parsefunction)) {
*NextLen = CurrentLen;
*Next = (*mibTreeEntry->instancefunction) (Current, NextLen, mibTreeEntry, &Fn);
if (*Next) {
- MemBuf tmp;
debugs(49, 6, "snmpTreeNext: Next : " << snmpDebugOid(*Next, *NextLen, tmp));
return (Fn);
}
}
if ((mibTreeEntry) && (mibTreeEntry->parsefunction)) {
- count--;
- nextoid = snmpTreeSiblingEntry(Current[count], count, mibTreeEntry->parent);
+ --count;
+ mib_tree_entry *nextoid = snmpTreeSiblingEntry(Current[count], count, mibTreeEntry->parent);
if (nextoid) {
debugs(49, 5, "snmpTreeNext: Next OID found for sibling" << nextoid );
mibTreeEntry = nextoid;
- count++;
+ ++count;
} else {
debugs(49, 5, "snmpTreeNext: Attempting to recurse up for next object");
while (!nextoid) {
- count--;
+ --count;
if (mibTreeEntry->parent->parent) {
nextoid = mibTreeEntry->parent;
}
if (*Next) {
- MemBuf tmp;
debugs(49, 6, "snmpTreeNext: Next : " << snmpDebugOid(*Next, *NextLen, tmp));
return (Fn);
} else
{
oid *instance = NULL;
if (*len <= current->len) {
- instance = (oid *)xmalloc(sizeof(name) * (*len + 1));
- memcpy(instance, name, (sizeof(name) * *len));
+ instance = (oid *)xmalloc(sizeof(*name) * (*len + 1));
+ memcpy(instance, name, sizeof(*name) * (*len));
instance[*len] = 0;
*len += 1;
}
int index[TIME_INDEX_LEN] = {TIME_INDEX};
if (*len <= current->len) {
- instance = (oid *)xmalloc(sizeof(name) * (*len + 1));
- memcpy(instance, name, (sizeof(name) * *len));
+ instance = (oid *)xmalloc(sizeof(*name) * (*len + 1));
+ memcpy(instance, name, sizeof(*name) * (*len));
instance[*len] = *index;
*len += 1;
} else {
identifier = name[*len - 1];
while ((loop < TIME_INDEX_LEN) && (identifier != index[loop]))
- loop++;
+ ++loop;
if (loop < (TIME_INDEX_LEN - 1)) {
- instance = (oid *)xmalloc(sizeof(name) * (*len));
- memcpy(instance, name, (sizeof(name) * *len));
+ instance = (oid *)xmalloc(sizeof(*name) * (*len));
+ memcpy(instance, name, sizeof(*name) * (*len));
instance[*len - 1] = index[++loop];
}
}
return (instance);
}
-
static oid *
peer_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn)
{
oid *instance = NULL;
- peer *peers = Config.peers;
+ CachePeer *peers = Config.peers;
if (peers == NULL) {
debugs(49, 6, "snmp peer_Inst: No Peers.");
while ((current) && (!current->parsefunction))
current = current->leaves[0];
+ if (!current)
+ return (instance);
+
instance = client_Inst(current->name, len, current, Fn);
} else if (*len <= current->len) {
debugs(49, 6, "snmp peer_Inst: *len <= current->len ???");
- instance = (oid *)xmalloc(sizeof(name) * ( *len + 1));
- memcpy(instance, name, (sizeof(name) * *len));
+ instance = (oid *)xmalloc(sizeof(*name) * ( *len + 1));
+ memcpy(instance, name, sizeof(*name) * (*len));
instance[*len] = 1 ;
*len += 1;
} else {
int no = name[current->len] ;
int i;
// Note: This works because the Config.peers keeps its index according to its position.
- for ( i=0 ; peers && (i < no) ; peers = peers->next , i++ ) ;
+ for ( i=0 ; peers && (i < no) ; peers = peers->next, ++i ) ;
if (peers) {
debugs(49, 6, "snmp peer_Inst: Encode peer #" << i);
- instance = (oid *)xmalloc(sizeof(name) * (current->len + 1 ));
- memcpy(instance, name, (sizeof(name) * current->len ));
+ instance = (oid *)xmalloc(sizeof(*name) * (current->len + 1 ));
+ memcpy(instance, name, (sizeof(*name) * current->len ));
instance[current->len] = no + 1 ; // i.e. the next index on cache_peeer table.
} else {
debugs(49, 6, "snmp peer_Inst: We have " << i << " peers. Can't find #" << no);
if (aux)
laddr = *aux;
else
- laddr.SetAnyAddr();
+ laddr.setAnyAddr();
- if (laddr.IsIPv4())
+ if (laddr.isIPv4())
size = sizeof(in_addr);
else
size = sizeof(in6_addr);
debugs(49, 6, HERE << "len" << *len << ", current-len" << current->len << ", addr=" << laddr << ", size=" << size);
- instance = (oid *)xmalloc(sizeof(name) * (*len + size ));
- memcpy(instance, name, (sizeof(name) * (*len)));
+ instance = (oid *)xmalloc(sizeof(*name) * (*len + size ));
+ memcpy(instance, name, (sizeof(*name) * (*len)));
- if ( !laddr.IsAnyAddr() ) {
+ if ( !laddr.isAnyAddr() ) {
addr2oid(laddr, &instance[ *len]); // the addr
*len += size ;
}
if (aux)
laddr = *aux;
else
- laddr.SetAnyAddr();
+ laddr.setAnyAddr();
- if (!laddr.IsAnyAddr()) {
- if (laddr.IsIPv4())
+ if (!laddr.isAnyAddr()) {
+ if (laddr.isIPv4())
newshift = sizeof(in_addr);
else
newshift = sizeof(in6_addr);
debugs(49, 6, HERE << "len" << *len << ", current-len" << current->len << ", addr=" << laddr << ", newshift=" << newshift);
- instance = (oid *)xmalloc(sizeof(name) * (current->len + newshift));
- memcpy(instance, name, (sizeof(name) * (current->len)));
+ instance = (oid *)xmalloc(sizeof(*name) * (current->len + newshift));
+ memcpy(instance, name, (sizeof(*name) * (current->len)));
addr2oid(laddr, &instance[current->len]); // the addr.
*len = current->len + newshift ;
}
next = current->leaves[count];
}
- count++;
+ ++count;
}
/* Exactly the sibling on right */
next = current->leaves[count];
}
- count++;
+ ++count;
}
return (next);
entry->leaves = (mib_tree_entry **)xrealloc(entry->leaves, sizeof(mib_tree_entry *) * (entry->children + 1));
entry->leaves[entry->children] = child;
entry->leaves[entry->children]->parent = entry;
- entry->children++;
+ ++ entry->children;
}
mib_tree_entry *
while (r < namelen) {
/* Find the child node which matches this */
- for (i = 0; i < e->children && e->leaves[i]->name[r] != name[r]; i++) ; // seek-loop
+ for (i = 0; i < e->children && e->leaves[i]->name[r] != name[r]; ++i) ; // seek-loop
/* Are we pointing to that node? */
if (i >= e->children)
/* Skip to that node! */
e = e->leaves[i];
- r++;
+ ++r;
}
xfree(name);
return e;
}
-int
+bool
snmpCreateOidFromStr(const char *str, oid **name, int *nl)
{
char const *delim = ".";
- char *p;
*name = NULL;
*nl = 0;
- char *s = xstrdup(str);
- char *s_ = s;
+ const char *s = str;
/* Parse the OID string into oid bits */
- while ( (p = strsep(&s_, delim)) != NULL) {
+ while (size_t len = strcspn(s, delim)) {
*name = (oid*)xrealloc(*name, sizeof(oid) * ((*nl) + 1));
- (*name)[*nl] = atoi(p);
- (*nl)++;
+ (*name)[*nl] = atoi(s); // stops at the '.' delimiter
+ ++(*nl);
+ // exit with true when the last octet has been parsed
+ if (s[len] == '\0')
+ return true;
+ s += len+1;
}
- xfree(s);
- return 1;
+ // if we aborted before the lst octet was found, return false.
+ safe_free(name);
+ return false;
}
/*
return m;
}
-
/*
* Adds a node to the MIB tree structure and adds the appropriate children
*/
if (children > 0) {
entry->leaves = (mib_tree_entry **)xmalloc(sizeof(mib_tree_entry *) * children);
- for (loop = 0; loop < children; loop++) {
+ for (loop = 0; loop < children; ++loop) {
entry->leaves[loop] = va_arg(args, mib_tree_entry *);
entry->leaves[loop]->parent = entry;
}
}
+ va_end(args);
return (entry);
}
/* End of tree utility functions */
new_oid = (oid *)xmalloc(sizeof(oid) * length);
if (length > 0) {
- for (loop = 0; loop < length; loop++) {
+ for (loop = 0; loop < length; ++loop) {
new_oid[loop] = va_arg(args, int);
}
}
+ va_end(args);
return (new_oid);
}
if (outbuf.isNull())
outbuf.init(16, MAX_IPSTRLEN);
- for (x = 0; x < Len; x++) {
+ for (x = 0; x < Len; ++x) {
size_t bytes = snprintf(mbuf, sizeof(mbuf), ".%u", (unsigned int) Name[x]);
outbuf.append(mbuf, bytes);
}
debugs(49, lvl, buf);
}
-
-
/*
IPv4 address: 10.10.0.9 ==>
oid == 10.10.0.9
u_char *cp = NULL;
struct in_addr i4addr;
struct in6_addr i6addr;
- oid code = addr.IsIPv6()? INETADDRESSTYPE_IPV6 : INETADDRESSTYPE_IPV4 ;
+ oid code = addr.isIPv6()? INETADDRESSTYPE_IPV6 : INETADDRESSTYPE_IPV4 ;
u_int size = (code == INETADDRESSTYPE_IPV4) ? sizeof(struct in_addr):sizeof(struct in6_addr);
// Dest[0] = code ;
if ( code == INETADDRESSTYPE_IPV4 ) {
- addr.GetInAddr(i4addr);
+ addr.getInAddr(i4addr);
cp = (u_char *) &(i4addr.s_addr);
} else {
- addr.GetInAddr(i6addr);
+ addr.getInAddr(i6addr);
cp = (u_char *) &i6addr;
}
- for ( i=0 ; i < size ; i++) {
+ for ( i=0 ; i < size ; ++i) {
// OID's are in network order
- Dest[i] = *cp++;
+ Dest[i] = *cp;
+ ++cp;
}
MemBuf tmp;
debugs(49, 7, "addr2oid: Dest : " << snmpDebugOid(Dest, size, tmp));
cp = (u_char *) &(i6addr);
MemBuf tmp;
debugs(49, 7, "oid2addr: id : " << snmpDebugOid(id, size, tmp) );
- for (i=0 ; i<size; i++) {
+ for (i=0 ; i<size; ++i) {
cp[i] = id[i];
}
if ( size == sizeof(struct in_addr) )
addr = i6addr;
}
-/* SNMP checklists */
-#include "acl/Strategy.h"
-#include "acl/Strategised.h"
-#include "acl/StringData.h"
-
-class ACLSNMPCommunityStrategy : public ACLStrategy<char const *>
-{
-
-public:
- virtual int match (ACLData<MatchType> * &, ACLFilledChecklist *);
- static ACLSNMPCommunityStrategy *Instance();
- /* Not implemented to prevent copies of the instance. */
- /* Not private to prevent brain dead g+++ warnings about
- * private constructors with no friends */
- ACLSNMPCommunityStrategy(ACLSNMPCommunityStrategy const &);
-
-private:
- static ACLSNMPCommunityStrategy Instance_;
- ACLSNMPCommunityStrategy() {}
-
- ACLSNMPCommunityStrategy&operator=(ACLSNMPCommunityStrategy const &);
-};
-
-class ACLSNMPCommunity
-{
-
-private:
- static ACL::Prototype RegistryProtoype;
- static ACLStrategised<char const *> RegistryEntry_;
-};
-
-ACL::Prototype ACLSNMPCommunity::RegistryProtoype(&ACLSNMPCommunity::RegistryEntry_, "snmp_community");
-ACLStrategised<char const *> ACLSNMPCommunity::RegistryEntry_(new ACLStringData, ACLSNMPCommunityStrategy::Instance(), "snmp_community");
-
int
ACLSNMPCommunityStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist)
{
return data->match (checklist->snmp_community);
}
-ACLSNMPCommunityStrategy *
-ACLSNMPCommunityStrategy::Instance()
-{
- return &Instance_;
-}
-
-ACLSNMPCommunityStrategy ACLSNMPCommunityStrategy::Instance_;
projects / thirdparty / squid.git / blobdiff