From e305f18c5fd971d8ee6ffb19d6eefc620bcf7d31 Mon Sep 17 00:00:00 2001 From: Chris Caputo Date: Mon, 22 Dec 2008 09:52:46 +0000 Subject: 64-bit fix for lib/smux.h SNMP_INTEGER() macro Macro SNMP_INTEGER() prepares data which is eventually processed by asn_build_int(). SNMP_INTEGER() was using "int32_t" whereas asn_build_int() uses "long". On 32-bit systems these are the same, both 4 bytes, but on x86 64-bit systems "long" is 8 bytes. asn_build_int()'s reaction to an improperly sized value is to return a NULL pointer. Quagga's smux.c would eventually get this NULL pointer and use it in calculations to determine how much data to send over the smux connection, resulting in garbage being sent to the SNMP agent. Corrected SNMP_INTEGER() to use "long". Tested on 32-bit and 64-bit x86 Linux 2.6.27.10 systems running Quagga 0.99.11 with bgpd smux. --- lib/smux.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/smux.h') diff --git a/lib/smux.h b/lib/smux.h index 11f02e9e..87a76648 100644 --- a/lib/smux.h +++ b/lib/smux.h @@ -127,12 +127,12 @@ struct trap_object /* Declare SMUX return value. */ #define SNMP_LOCAL_VARIABLES \ - static int32_t snmp_int_val; \ + static long snmp_int_val; \ static struct in_addr snmp_in_addr_val; #define SNMP_INTEGER(V) \ ( \ - *var_len = sizeof (int32_t), \ + *var_len = sizeof (snmp_int_val), \ snmp_int_val = V, \ (u_char *) &snmp_int_val \ ) -- cgit v1.2.3