svn commit: samba r25510 - in branches: SAMBA_3_2/source/lib
SAMBA_3_2/source/libsmb SAMBA_3_2_0/source/lib
SAMBA_3_2_0/source/libsmb
jra at samba.org
jra at samba.org
Fri Oct 5 01:11:37 GMT 2007
Author: jra
Date: 2007-10-05 01:11:33 +0000 (Fri, 05 Oct 2007)
New Revision: 25510
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25510
Log:
Now we're returning the port instead of using a global,
remember to use ntohs. Hopefully will fix the build farm.
Jeremy.
Modified:
branches/SAMBA_3_2/source/lib/util_sock.c
branches/SAMBA_3_2/source/libsmb/nmblib.c
branches/SAMBA_3_2_0/source/lib/util_sock.c
branches/SAMBA_3_2_0/source/libsmb/nmblib.c
Changeset:
Modified: branches/SAMBA_3_2/source/lib/util_sock.c
===================================================================
--- branches/SAMBA_3_2/source/lib/util_sock.c 2007-10-04 23:20:30 UTC (rev 25509)
+++ branches/SAMBA_3_2/source/lib/util_sock.c 2007-10-05 01:11:33 UTC (rev 25510)
@@ -319,12 +319,12 @@
}
if (psa->ss_family != AF_INET) {
- DEBUG(2,("read_udp_v4_socket:: invalid address family %d "
+ DEBUG(2,("read_udp_v4_socket: invalid address family %d "
"(not IPv4)\n", (int)psa->ss_family));
return 0;
}
- DEBUG(10,("read_udp_socket: ip %s port %d read: %lu\n",
+ DEBUG(10,("read_udp_v4_socket: ip %s port %d read: %lu\n",
inet_ntoa(si->sin_addr),
si->sin_port,
(unsigned long)ret));
Modified: branches/SAMBA_3_2/source/libsmb/nmblib.c
===================================================================
--- branches/SAMBA_3_2/source/libsmb/nmblib.c 2007-10-04 23:20:30 UTC (rev 25509)
+++ branches/SAMBA_3_2/source/libsmb/nmblib.c 2007-10-05 01:11:33 UTC (rev 25510)
@@ -789,7 +789,7 @@
length,
packet_type,
si->sin_addr,
- si->sin_port);
+ ntohs(si->sin_port));
if (!packet)
return NULL;
Modified: branches/SAMBA_3_2_0/source/lib/util_sock.c
===================================================================
--- branches/SAMBA_3_2_0/source/lib/util_sock.c 2007-10-04 23:20:30 UTC (rev 25509)
+++ branches/SAMBA_3_2_0/source/lib/util_sock.c 2007-10-05 01:11:33 UTC (rev 25510)
@@ -319,12 +319,12 @@
}
if (psa->ss_family != AF_INET) {
- DEBUG(2,("read_udp_v4_socket:: invalid address family %d "
+ DEBUG(2,("read_udp_v4_socket: invalid address family %d "
"(not IPv4)\n", (int)psa->ss_family));
return 0;
}
- DEBUG(10,("read_udp_socket: ip %s port %d read: %lu\n",
+ DEBUG(10,("read_udp_v4_socket: ip %s port %d read: %lu\n",
inet_ntoa(si->sin_addr),
si->sin_port,
(unsigned long)ret));
Modified: branches/SAMBA_3_2_0/source/libsmb/nmblib.c
===================================================================
--- branches/SAMBA_3_2_0/source/libsmb/nmblib.c 2007-10-04 23:20:30 UTC (rev 25509)
+++ branches/SAMBA_3_2_0/source/libsmb/nmblib.c 2007-10-05 01:11:33 UTC (rev 25510)
@@ -789,7 +789,7 @@
length,
packet_type,
si->sin_addr,
- si->sin_port);
+ ntohs(si->sin_port));
if (!packet)
return NULL;
More information about the samba-cvs
mailing list