diff options
| author | Jeremy Allison <jra@samba.org> | 1997-10-17 23:08:07 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-10-17 23:08:07 +0000 |
| commit | c336a2f08183f63031b0a08b2111669bc36a5f30 (patch) | |
| tree | e6773bb1bbbde2c829a55ec608f270233f8a925f /source3/lib | |
| parent | a0a28db75365d974ee05aee9dd4fde1ffc3db72c (diff) | |
| download | samba-c336a2f08183f63031b0a08b2111669bc36a5f30.tar.gz samba-c336a2f08183f63031b0a08b2111669bc36a5f30.tar.xz samba-c336a2f08183f63031b0a08b2111669bc36a5f30.zip | |
.cvsignore: Added make_smbcodepage
interface.c: Added is_local_net().
locking.c: Added Fix for zero length share files from Gerald Werner <wernerg@mfldclin.edu>
plus a race condition fix for the fix.
nameannounce.c: Made function static.
namedbresp.c: extern int ClientDGRAM removed - not used.
namedbserver.c: extern int ClientDGRAM removed - not used.
namedbsubnet.c: Added code to make sockets per subnet.
namepacket.c: Added code to read from all sockets & filter.
nameresp.c: extern int ClientDGRAM removed - not used.
nameserv.c: Indentation tidyup :-).
nameserv.h: Added sockets to struct subnet.
nameservresp.c: Improved debug message.
nmbd.c: Changed to terminte on listen_for_packets exiting.
nmbsync.c: extern int ClientDGRAM & ClientNMB removed - not used.
proto.h: The usual.
util.c: Fixed debug message.
Jeremy (jallison@whistle.com)
(This used to be commit 6904c2de080b2a9702800e9e4126386ced20569d)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/interface.c | 12 | ||||
| -rw-r--r-- | source3/lib/util.c | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/source3/lib/interface.c b/source3/lib/interface.c index 1dc605ff2f..c920cc0cfc 100644 --- a/source3/lib/interface.c +++ b/source3/lib/interface.c @@ -400,6 +400,18 @@ BOOL ismybcast(struct in_addr bcast) } /**************************************************************************** + check if a packet is from a local (known) net + **************************************************************************/ +BOOL is_local_net(struct in_addr from) +{ + struct interface *i; + for (i=local_interfaces;i;i=i->next) + if((from.s_addr & i->nmask.s_addr) == (i->ip.s_addr & i->nmask.s_addr)) + return True; + return False; +} + +/**************************************************************************** how many interfaces do we have **************************************************************************/ int iface_count(void) diff --git a/source3/lib/util.c b/source3/lib/util.c index a82713a0d8..b69b30d20c 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -3284,8 +3284,8 @@ int open_socket_in(int type, int port, int dlevel,uint32 socket_addr) { if (port) { if (port == SMB_PORT || port == NMB_PORT) - DEBUG(dlevel,("bind failed on port %d socket_addr=%x (%s)\n", - port,socket_addr,strerror(errno))); + DEBUG(dlevel,("bind failed on port %d socket_addr=%s (%s)\n", + port,inet_ntoa(sock.sin_addr),strerror(errno))); close(res); if (dlevel > 0 && port < 1000) |