diff options
| author | Jeremy Allison <jra@samba.org> | 1997-10-23 22:30:57 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-10-23 22:30:57 +0000 |
| commit | abb255cfe674a39c6a42f5083af9c5facdbcca05 (patch) | |
| tree | bccbf53d36ce62b7a0e23cbcf628a53850c2db95 /source3/include/nameserv.h | |
| parent | 5557ab3c007b79c132e9a2da16e41be7b13f1b39 (diff) | |
| download | samba-abb255cfe674a39c6a42f5083af9c5facdbcca05.tar.gz samba-abb255cfe674a39c6a42f5083af9c5facdbcca05.tar.bz2 samba-abb255cfe674a39c6a42f5083af9c5facdbcca05.zip | |
Big change to make nmbd code more readable/understandable.
Main change is removal of find_name_search() confusion.
This has been replaced with find_name_on_subnet() which
makes it explicit what is being searched.
Also changed wins_subnet to be wins_client_subnet in
preparation for splitting the wins subnet into client
and server pieces.
This is a big nmbd change and I'd appreciate any
bug reports.
Specific changes follow :
asyncdns.c:
Removed wins entry from add_netbios_entry(). This is now
explicit in the subnet_record parameter.
interface.c:
iface_bcast(), iface_nmask(), iface_ip() return the
default interface if none can be found. Made this
behavior explicit - some code in nmbd incorrectly
depended upon this (reply_name_status() for instance).
nameannounce.c:
find_name_search changes to find_name_on_subnet.
namebrowse.c:
wins_subnet renamed to wins_client_subnet.
namedbname.c:
find_name_search removed. find_name_on_subnet added.
add_netbios_entry - wins parameter removed.
namedbsubnet.c:
find_req_subnet removed - not explicit enough.
nameelect.c:
wins_subnet renamed to wins_client_subnet.
namepacket.c:
listening() simplified.
nameresp.c:
wins_subnet renamed to wins_client_subnet.
nameserv.c:
find_name_search moved to find_name_on_subnet.
nameserv.h:
FIND_XXX -> changed to FIND_SELF_NAME, FIND_ANY_NAME.
nameservreply.c:
find_name_search moved to find_name_on_subnet.
Debug entries changed.
nameservresp.c:
wins_subnet renamed to wins_client_subnet.
namework.c:
wins_subnet renamed to wins_client_subnet.
nmbd.c:
wins parameter removed from add_netbios_entry.
nmbsync:
wins_subnet renamed to wins_client_subnet.
proto.h: The usual.
server.c:
remove accepted fd from fd_set.
Jeremy (jallison@whistle.com)
(This used to be commit 2c97b33fc0b5ef181dbf51a50cb61074935165bf)
Diffstat (limited to 'source3/include/nameserv.h')
| -rw-r--r-- | source3/include/nameserv.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h index 5c8ec1e4eb..2a7bb29070 100644 --- a/source3/include/nameserv.h +++ b/source3/include/nameserv.h @@ -38,9 +38,8 @@ #define NMB_WAIT_ACK 0x07 /* see rfc1002.txt 4.2.16 */ /* XXXX what about all the other types?? 0x1, 0x2, 0x3, 0x4, 0x8? */ -#define FIND_SELF 0x01 -#define FIND_WINS 0x02 -#define FIND_LOCAL 0x04 +#define FIND_ANY_NAME 0 +#define FIND_SELF_NAME 1 /* NetBIOS flags */ #define NB_GROUP 0x80 @@ -428,11 +427,11 @@ struct packet_struct the WINS subnet. */ extern struct subnet_record *subnetlist; -extern struct subnet_record *wins_subnet; +extern struct subnet_record *wins_client_subnet; #define FIRST_SUBNET subnetlist #define NEXT_SUBNET_EXCLUDING_WINS(x) ((x)->next) -#define NEXT_SUBNET_INCLUDING_WINS(x) ( ((x) == wins_subnet) ? NULL : \ - (((x)->next == NULL) ? wins_subnet : \ +#define NEXT_SUBNET_INCLUDING_WINS(x) ( ((x) == wins_client_subnet) ? NULL : \ + (((x)->next == NULL) ? wins_client_subnet : \ (x)->next)) |