Now we're returning the port instead of using a global,
authorjra <jra@0c0555d6-39d7-0310-84fc-f1cc0bd64818>
Fri, 5 Oct 2007 01:11:33 +0000 (01:11 +0000)
committerjra <jra@0c0555d6-39d7-0310-84fc-f1cc0bd64818>
Fri, 5 Oct 2007 01:11:33 +0000 (01:11 +0000)
remember to use ntohs. Hopefully will fix the build farm.
Jeremy.

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_2@25510 0c0555d6-39d7-0310-84fc-f1cc0bd64818

source/lib/util_sock.c
source/libsmb/nmblib.c

index bcc1e8e..f77fcc9 100644 (file)
@@ -319,12 +319,12 @@ ssize_t read_udp_v4_socket(int fd,
        }
 
        if (psa->ss_family != AF_INET) {
        }
 
        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;
        }
 
                        "(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));
                        inet_ntoa(si->sin_addr),
                        si->sin_port,
                        (unsigned long)ret));
index 74deb91..61e24eb 100644 (file)
@@ -789,7 +789,7 @@ struct packet_struct *read_packet(int fd,enum packet_type packet_type)
                        length,
                        packet_type,
                        si->sin_addr,
                        length,
                        packet_type,
                        si->sin_addr,
-                       si->sin_port);
+                       ntohs(si->sin_port));
        if (!packet)
                return NULL;
 
        if (!packet)
                return NULL;