configure.in should be right - but whatever happened to the LDFLAGs stuff et al that needs to go into configureextra/SOLARIS or configureextra/SOLARIS9 ??
globals-core.h is fine, obviously. Yeah, with pep gone, don't need access to that function outside of vendor.c... WRT myrrd/Makefile.in, what's this fixing? I'll ignore report.c for now... Similarly, utils/prefixtablegen.c - oh I see - you're including config.h so you can #ifdef out the other includes. Interesting - hadn't really thought about that - it's supposed to be a stand alone piece of code. With that fix, if you haven't completed a ./configure, then it now won't build. But if you haven't done ./configure, then you shouldn't have the Makefile to run make p2c ... should be a safe bet. It will nail anyone who runs it directly, however... s'be'it... -----Burton -----Original Message----- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Behalf Of Chris Turbeville Sent: Tuesday, August 19, 2003 3:50 PM To: [EMAIL PROTECTED] Subject: Re: [Ntop-dev] Sparc Sol9 > > I'll have to look it over - I'm in something right now - offhand the > configure.in stuff looks about right. Not sure about the cross-platform > impact of some of the others... Well as I said the report.c stuff is in the wrong place but I'll walk each for clarity: globals-core.h - this is just a typo I corrected pbuf.c - this is the alignment error that everyones talked about. Really the fingreprint code could be using the memcpyd tp struct the whole time but its easy to patch just that line. report.c - this does have a couple of missed null checks I can resubmit when its better. vendor.c - this was a fix for pep which seems to have been removed from the CVS:) -Chris > > -----Burton > > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Behalf > Of Chris Turbeville > Sent: Tuesday, August 19, 2003 2:00 PM > To: [EMAIL PROTECTED] > Subject: Re: [Ntop-dev] Sparc Sol9 > > > Ok how's this diff: > > Index: ntop/configure.in > =================================================================== > RCS file: /export/home/ntop/ntop/configure.in,v > retrieving revision 2.164 > diff -r2.164 configure.in > 1943,1944c1943,1953 > < AC_CHECK_HEADERS([net/if.h]) > < AC_CHECK_HEADERS([netinet/if_ether.h]) > --- > > AC_CHECK_HEADERS([net/if.h], [], [], > > [#ifdef HAVE_SYS_SOCKET_H > > #include <sys/socket.h> > > #endif]) > > AC_CHECK_HEADERS([netinet/if_ether.h], [], [], > > [#ifdef HAVE_SYS_SOCKET_H > > #include <sys/socket.h> > > #endif > > #ifdef HAVE_NET_IF_H > > #include <net/if.h> > > #endif]) > 1946,1947c1955,1971 > < AC_CHECK_HEADERS([netinet/ip.h]) > < AC_CHECK_HEADERS([netinet/ip_icmp.h]) > --- > > AC_CHECK_HEADERS([netinet/ip.h], [], [], > > [#ifdef HAVE_NETINET_IN_H > > #include <netinet/in.h> > > #endif]) > > AC_CHECK_HEADERS([netinet/ip_icmp.h], [], [], > > [#ifdef HAVE_SYS_SOCKET_H > > #include <sys/socket.h> > > #endif > > #ifdef HAVE_NETINET_IN_H > > #include <netinet/in.h> > > #endif > > #ifdef HAVE_NETINET_IN_SYSTM_H > > #include <netinet/in_systm.h> > > #endif > > #ifdef HAVE_NETINET_IP_H > > #include <netinet/ip.h> > > #endif]) > 1949c1973,1976 > < AC_CHECK_HEADERS([netinet/udp.h]) > --- > > AC_CHECK_HEADERS([netinet/udp.h], [], [], > > [#ifdef HAVE_NETINET_IN_H > > #include <netinet/in.h> > > #endif]) > 1951a1979 > > AC_CHECK_HEADERS([net/ppp_defs.h]) > Index: ntop/globals-core.h > =================================================================== > RCS file: /export/home/ntop/ntop/globals-core.h,v > retrieving revision 2.133 > diff -r2.133 globals-core.h > 178c178 > < extern datum ntop_gdbm_firstkey(GDBM_FILE g);; > --- > > extern datum ntop_gdbm_firstkey(GDBM_FILE g); > Index: ntop/pbuf.c > =================================================================== > RCS file: /export/home/ntop/ntop/pbuf.c,v > retrieving revision 2.135 > diff -r2.135 pbuf.c > 963c963 > < u_char *tcp_data = (u_char *)((int)tcp + tcp->th_off * 4); > --- > > u_char *tcp_data = (u_char *)((int)tcp + tp.th_off * 4); > Index: ntop/report.c > =================================================================== > RCS file: /export/home/ntop/ntop/report.c,v > retrieving revision 2.159 > diff -r2.159 report.c > 609c609,610 > < snprintf(buf, sizeof(buf), "%s/interfaces/%s", myGlobals.rrdPath, > --- > > snprintf(buf, sizeof(buf), "%s/interfaces/%s", > > myGlobals.rrdPath != NULL ? myGlobals.rrdPath : "", > 1111a1113,1122 > > if((*a == NULL) && (*b != NULL)) { > > traceEvent(CONST_TRACE_WARNING, "cmpFctn() error (4)"); > > return(1); > > } else if((*a != NULL) && (*b == NULL)) { > > traceEvent(CONST_TRACE_WARNING, "cmpFctn() error (5)"); > > return(-1); > > } else if((*a == NULL) && (*b == NULL)) { > > traceEvent(CONST_TRACE_WARNING, "cmpFctn() error (6)"); > > return(0); > > } > 2630a2642,2643 > > if((a == NULL) || (b == NULL)) > > return(0); > Index: ntop/vendor.c > =================================================================== > RCS file: /export/home/ntop/ntop/vendor.c,v > retrieving revision 2.21 > diff -r2.21 vendor.c > 268c268 > < static char* getMACInfo(int special, u_char* ethAddress, short > encodeString) { > --- > > /*static*/ char* getMACInfo(int special, u_char* ethAddress, short > encodeString) { > Index: ntop/myrrd/Makefile.in > =================================================================== > RCS file: /export/home/ntop/ntop/myrrd/Makefile.in,v > retrieving revision 1.4 > diff -r1.4 Makefile.in > 17c17 > < $(CC) -c -g -I. -I.. @INCS@ -DHAVE_CONFIG_H $< > --- > > $(CC) -c -g -I. -I.. @CPPFLAGS@ -DHAVE_CONFIG_H $< > Index: ntop/utils/prefixtablegen.c > =================================================================== > RCS file: /export/home/ntop/ntop/utils/prefixtablegen.c,v > retrieving revision 1.2 > diff -r1.2 prefixtablegen.c > 30a31 > > #include "../config.h" > 35a37,42 > > #ifdef HAVE_SYS_TYPES_H > > #include <sys/types.h> > > #endif > > #ifdef HAVE_NET_PPP_DEFS_H > > #include <net/ppp_defs.h> > > #endif > > -- > [EMAIL PROTECTED] Chris Turbeville > NTT/VERIO > Send mail with subject "send PGP Key" for PGP 6.5.2 Public key > _______________________________________________ > Ntop-dev mailing list > [EMAIL PROTECTED] > http://listgateway.unipi.it/mailman/listinfo/ntop-dev > > _______________________________________________ > Ntop-dev mailing list > [EMAIL PROTECTED] > http://listgateway.unipi.it/mailman/listinfo/ntop-dev > -- [EMAIL PROTECTED] Chris Turbeville NTT/VERIO Send mail with subject "send PGP Key" for PGP 6.5.2 Public key _______________________________________________ Ntop-dev mailing list [EMAIL PROTECTED] http://listgateway.unipi.it/mailman/listinfo/ntop-dev _______________________________________________ Ntop-dev mailing list [EMAIL PROTECTED] http://listgateway.unipi.it/mailman/listinfo/ntop-dev
