version 1.1.1.1, 2017/06/12 07:58:55
|
version 1.1.1.1.2.1, 2017/06/14 09:28:09
|
Line 115 igmp_read(i, rfd)
|
Line 115 igmp_read(i, rfd)
|
fd_set *rfd; |
fd_set *rfd; |
{ |
{ |
register int igmp_recvlen; |
register int igmp_recvlen; |
int dummy = 0; | socklen_t dummy = 0; |
|
|
igmp_recvlen = recvfrom(igmp_socket, igmp_recv_buf, RECV_BUF_SIZE, |
igmp_recvlen = recvfrom(igmp_socket, igmp_recv_buf, RECV_BUF_SIZE, |
0, NULL, &dummy); |
0, NULL, &dummy); |
Line 168 accept_igmp(recvlen)
|
Line 168 accept_igmp(recvlen)
|
#ifdef RAW_INPUT_IS_RAW |
#ifdef RAW_INPUT_IS_RAW |
ipdatalen = ntohs(ip->ip_len) - iphdrlen; |
ipdatalen = ntohs(ip->ip_len) - iphdrlen; |
#else |
#else |
|
#if __FreeBSD_version >= 1000000 |
|
ipdatalen = ip->ip_len - iphdrlen; |
|
#else |
ipdatalen = ip->ip_len; |
ipdatalen = ip->ip_len; |
|
#endif |
#endif |
#endif |
if (iphdrlen + ipdatalen != recvlen) { |
if (iphdrlen + ipdatalen != recvlen) { |
log(LOG_WARNING, 0, |
log(LOG_WARNING, 0, |
Line 257 accept_igmp(recvlen)
|
Line 261 accept_igmp(recvlen)
|
return; |
return; |
|
|
case DVMRP_INFO_REQUEST: |
case DVMRP_INFO_REQUEST: |
dvmrp_accept_info_request(src, dst, (char *)(igmp+1), igmpdatalen); | dvmrp_accept_info_request(src, dst, (u_char *)(igmp+1), igmpdatalen); |
return; |
return; |
|
|
case DVMRP_INFO_REPLY: |
case DVMRP_INFO_REPLY: |
dvmrp_accept_info_reply(src, dst, (char *)(igmp+1), igmpdatalen); | dvmrp_accept_info_reply(src, dst, (u_char *)(igmp+1), igmpdatalen); |
return; |
return; |
|
|
default: |
default: |