sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-30 20:23:49 +03:00
Code Activity

Syncup between 2.2 and HEAD.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison
-
parent 19fdc553d6
commit 39d4131a45
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/lib/util_sock.c
View File

@@ -174,26 +174,25 @@ void set_socket_options(int fd, char *options)
ssize_t read_udp_socket(int fd,char *buf,size_t len)
{
ssize_t ret;
struct sockaddr_in sock;
int socklen;
socklen = sizeof(sock);
memset((char *)&sock,'\0',socklen);
memset((char *)&lastip,'\0',sizeof(lastip));
ret = (ssize_t)recvfrom(fd,buf,len,0,(struct sockaddr *)&sock,&socklen);
if (ret <= 0) {
DEBUG(2,("read socket failed. ERRNO=%s\n",strerror(errno)));
return(0);
}
ssize_t ret;
struct sockaddr_in sock;
socklen_t socklen = sizeof(sock);
lastip = sock.sin_addr;
lastport = ntohs(sock.sin_port);
memset((char *)&sock,'\0',socklen);
memset((char *)&lastip,'\0',sizeof(lastip));
ret = (ssize_t)recvfrom(fd,buf,len,0,(struct sockaddr *)&sock,&socklen);
if (ret <= 0) {
DEBUG(2,("read socket failed. ERRNO=%s\n",strerror(errno)));
return(0);
}
DEBUG(10,("read_udp_socket: lastip %s lastport %d read: %d\n",
inet_ntoa(lastip), lastport, ret));
lastip = sock.sin_addr;
lastport = ntohs(sock.sin_port);
return(ret);
DEBUG(10,("read_udp_socket: lastip %s lastport %d read: %d\n",
inet_ntoa(lastip), lastport, ret));
return(ret);
}
/****************************************************************************