@@ -160,11 +160,6 @@ static int dlrawdatareq(int, const u_char *, int);
160160static int recv_ack (int , int , const char * , char * , char * , int * );
161161static char * dlstrerror (char * , size_t , bpf_u_int32 );
162162static char * dlprim (char * , size_t , bpf_u_int32 );
163- #if defined(HAVE_SOLARIS ) && defined(HAVE_SYS_BUFMOD_H )
164- #define GET_RELEASE_BUFSIZE 32
165- static void get_release (char * , size_t , bpf_u_int32 * , bpf_u_int32 * ,
166- bpf_u_int32 * );
167- #endif
168163static int send_request (int , char * , int , char * , char * );
169164#ifdef HAVE_HPUX9
170165static int dlpi_kread (int , off_t , void * , u_int , char * );
@@ -528,10 +523,6 @@ pcap_activate_dlpi(pcap_t *p)
528523 register dl_info_ack_t * infop ;
529524#ifdef HAVE_SYS_BUFMOD_H
530525 bpf_u_int32 ss ;
531- #ifdef HAVE_SOLARIS
532- char release [GET_RELEASE_BUFSIZE ];
533- bpf_u_int32 osmajor , osminor , osmicro ;
534- #endif
535526#endif
536527 bpf_u_int32 buf [MAXDLBUF ];
537528
@@ -811,27 +802,6 @@ pcap_activate_dlpi(pcap_t *p)
811802
812803#ifdef HAVE_SYS_BUFMOD_H
813804 ss = p -> snapshot ;
814-
815- /*
816- ** There is a bug in bufmod(7). When dealing with messages of
817- ** less than snaplen size it strips data from the beginning not
818- ** the end.
819- **
820- ** This bug is fixed in 5.3.2. Also, there is a patch available.
821- ** Ask for bugid 1149065.
822- */
823- #ifdef HAVE_SOLARIS
824- get_release (release , sizeof (release ), & osmajor , & osminor , & osmicro );
825- if (osmajor == 5 && (osminor <= 2 || (osminor == 3 && osmicro < 2 )) &&
826- getenv ("BUFMOD_FIXED" ) == NULL ) {
827- snprintf (p -> errbuf , PCAP_ERRBUF_SIZE ,
828- "WARNING: bufmod is broken in SunOS %s; ignoring snaplen." ,
829- release );
830- ss = 0 ;
831- status = PCAP_WARNING ;
832- }
833- #endif
834-
835805 /* Push and configure bufmod. */
836806 if (pcap_conf_bufmod (p , ss ) != 0 ) {
837807 status = PCAP_ERROR ;
@@ -1566,33 +1536,6 @@ dlrawdatareq(int fd, const u_char *datap, int datalen)
15661536}
15671537#endif /* DL_HP_RAWDLS */
15681538
1569- #if defined(HAVE_SOLARIS ) && defined(HAVE_SYS_BUFMOD_H )
1570- static void
1571- get_release (char * buf , size_t bufsize , bpf_u_int32 * majorp ,
1572- bpf_u_int32 * minorp , bpf_u_int32 * microp )
1573- {
1574- char * cp ;
1575-
1576- * majorp = 0 ;
1577- * minorp = 0 ;
1578- * microp = 0 ;
1579- if (sysinfo (SI_RELEASE , buf , bufsize ) < 0 ) {
1580- pcapint_strlcpy (buf , "?" , bufsize );
1581- return ;
1582- }
1583- cp = buf ;
1584- if (!PCAP_ISDIGIT ((unsigned char )* cp ))
1585- return ;
1586- * majorp = strtol (cp , & cp , 10 );
1587- if (* cp ++ != '.' )
1588- return ;
1589- * minorp = strtol (cp , & cp , 10 );
1590- if (* cp ++ != '.' )
1591- return ;
1592- * microp = strtol (cp , & cp , 10 );
1593- }
1594- #endif
1595-
15961539#ifdef DL_HP_PPA_REQ
15971540/*
15981541 * Under HP-UX 10 and HP-UX 11, we can ask for the ppa
0 commit comments