Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.2
net-snmp
net-snmp-5.4.x_snmptrapd-hostname.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File net-snmp-5.4.x_snmptrapd-hostname.patch of Package net-snmp
From: Dave Shield Subject: Move hostname translation into the transport-specific library routines. References: bnc#514333 Patch-mainline: r15784, r15785 Signed-off-by: Marcus Rueckert <mrueckert@suse.de> Signed-off-by: Leonardo Chiquitto <lchiquitto@suse.de> --- apps/snmptrapd_log.c | 150 ++++++++---------------------- include/net-snmp/library/snmp_transport.h | 1 snmplib/snmpUDPDomain.c | 15 +-- 3 files changed, 53 insertions(+), 113 deletions(-) Index: snmplib/snmpUDPDomain.c =================================================================== --- snmplib/snmpUDPDomain.c.orig +++ snmplib/snmpUDPDomain.c @@ -90,6 +90,7 @@ static char * netsnmp_udp_fmtaddr(netsnmp_transport *t, void *data, int len) { netsnmp_udp_addr_pair *addr_pair = NULL; + struct hostent *host; if (data != NULL && len == sizeof(netsnmp_udp_addr_pair)) { addr_pair = (netsnmp_udp_addr_pair *) data; @@ -104,13 +105,15 @@ netsnmp_udp_fmtaddr(netsnmp_transport *t char tmp[64]; to = (struct sockaddr_in *) &(addr_pair->remote_addr); if (to == NULL) { - sprintf(tmp, "UDP: unknown->[%s]", - inet_ntoa(addr_pair->local_addr)); - } else { - sprintf(tmp, "UDP: [%s]:%hu->", - inet_ntoa(to->sin_addr), ntohs(to->sin_port)); - sprintf(tmp + strlen(tmp), "[%s]", inet_ntoa(addr_pair->local_addr)); + return strdup("UDP: unknown"); + } + + if ( t && t->flags & NETSNMP_TRANSPORT_FLAG_HOSTNAME ) { + host = gethostbyaddr((char *)&to->sin_addr, 4, AF_INET); + return (host ? strdup(host->h_name) : NULL); } + sprintf(tmp, "UDP: [%s]:%hu", + inet_ntoa(to->sin_addr), ntohs(to->sin_port)); return strdup(tmp); } } Index: apps/snmptrapd_log.c =================================================================== --- apps/snmptrapd_log.c.orig +++ apps/snmptrapd_log.c @@ -626,6 +626,8 @@ realloc_handle_ip_fmt(u_char ** buf, siz char fmt_cmd = options->cmd; /* what we're formatting */ u_char *temp_buf = NULL; size_t temp_buf_len = 64, temp_out_len = 0; + char *tstr; + unsigned int oflags; if ((temp_buf = calloc(temp_buf_len, 1)) == NULL) { return 0; @@ -681,130 +683,59 @@ realloc_handle_ip_fmt(u_char ** buf, siz * Write the numerical transport information. */ if (transport != NULL && transport->f_fmtaddr != NULL) { - char *tstr = - transport->f_fmtaddr(transport, pdu->transport_data, - pdu->transport_data_length); - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, (u_char *)tstr)) { - if (tstr != NULL) { - free(tstr); - } - if (temp_buf != NULL) { - free(temp_buf); - } + oflags = transport->flags; + transport->flags &= ~NETSNMP_TRANSPORT_FLAG_HOSTNAME; + tstr = transport->f_fmtaddr(transport, pdu->transport_data, + pdu->transport_data_length); + transport->flags = oflags; + + if (!tstr) goto noip; + if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, + 1, (u_char *)tstr)) { + SNMP_FREE(temp_buf); + SNMP_FREE(tstr); return 0; } - if (tstr != NULL) { - free(tstr); - } + SNMP_FREE(tstr); } else { - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, - (const u_char*)"<UNKNOWN>")) { - if (temp_buf != NULL) { - free(temp_buf); - } +noip: + if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, 1, + (const u_char*)"<UNKNOWN>")) { + SNMP_FREE(temp_buf); return 0; } } break; - /* - * Write a host name. - */ case CHR_PDU_NAME: /* - * Right, apparently a name lookup is wanted. This is only reasonable - * for the UDP and TCP transport domains (we don't want to try to be - * too clever here). + * Try to convert the numerical transport information + * into a hostname. Or rather, have the transport-specific + * address formatting routine do this. + * Otherwise falls back to the numeric address format. */ -#ifdef NETSNMP_TRANSPORT_TCP_DOMAIN - if (transport != NULL && (transport->domain == netsnmpUDPDomain || - transport->domain == - netsnmp_snmpTCPDomain)) { -#else - if (transport != NULL && transport->domain == netsnmpUDPDomain) { -#endif - /* - * This is kind of bletcherous -- it breaks the opacity of - * transport_data but never mind -- the alternative is a lot of - * munging strings from f_fmtaddr. - */ -typedef struct netsnmp_udp_addr_pair_s { /* From snmpUDPDomain.c */ - struct sockaddr_in remote_addr; - struct in_addr local_addr; -} netsnmp_udp_addr_pair; - - netsnmp_udp_addr_pair *addr = - (netsnmp_udp_addr_pair *) pdu->transport_data; - if (addr != NULL - && pdu->transport_data_length == - sizeof(netsnmp_udp_addr_pair)) { - if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, - NETSNMP_DS_APP_NUMERIC_IP)) { - host = - gethostbyaddr((char *) &(addr->remote_addr.sin_addr), - sizeof(struct in_addr), AF_INET); - } - if (host != NULL) { - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, - (u_char *)host->h_name)) { - if (temp_buf != NULL) { - free(temp_buf); - } - return 0; - } - } else { - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, - (u_char *)inet_ntoa(addr->remote_addr.sin_addr))) { - if (temp_buf != NULL) { - free(temp_buf); - } - return 0; - } - } - } else { - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, - (const u_char*)"<UNKNOWN>")) { - if (temp_buf != NULL) { - free(temp_buf); - } - return 0; - } - } - } else if (transport != NULL && transport->f_fmtaddr != NULL) { - /* - * Some other domain for which we do not know how to do a name - * lookup. Fall back to the formatted transport address. - */ - char *tstr = - transport->f_fmtaddr(transport, pdu->transport_data, - pdu->transport_data_length); - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, (u_char *)tstr)) { - if (tstr != NULL) { - free(tstr); - } - if (temp_buf != NULL) { - free(temp_buf); - } + if (transport != NULL && transport->f_fmtaddr != NULL) { + oflags = transport->flags; + if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, + NETSNMP_DS_APP_NUMERIC_IP)) + transport->flags |= NETSNMP_TRANSPORT_FLAG_HOSTNAME; + tstr = transport->f_fmtaddr(transport, pdu->transport_data, + pdu->transport_data_length); + transport->flags = oflags; + + if (!tstr) goto nohost; + if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, + 1, (u_char *)tstr)) { + SNMP_FREE(temp_buf); + SNMP_FREE(tstr); return 0; } - if (tstr != NULL) { - free(tstr); - } + SNMP_FREE(tstr); } else { - /* - * We are kind of stuck! - */ +nohost: if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, 1, (const u_char*)"<UNKNOWN>")) { - if (temp_buf != NULL) { - free(temp_buf); - } + SNMP_FREE(temp_buf); return 0; } } Index: include/net-snmp/library/snmp_transport.h =================================================================== --- include/net-snmp/library/snmp_transport.h.orig +++ include/net-snmp/library/snmp_transport.h @@ -19,6 +19,7 @@ extern "C" { #define NETSNMP_TRANSPORT_FLAG_STREAM 0x01 #define NETSNMP_TRANSPORT_FLAG_LISTEN 0x02 #define NETSNMP_TRANSPORT_FLAG_TUNNELED 0x04 +#define NETSNMP_TRANSPORT_FLAG_HOSTNAME 0x80 /* for fmtaddr hook */ /* The standard SNMP domains. */
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
