diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/nameserv.h | 11 | ||||
| -rw-r--r-- | source3/include/proto.h | 20 |
2 files changed, 12 insertions, 19 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)) diff --git a/source3/include/proto.h b/source3/include/proto.h index 96c4779e62..603399758f 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -440,20 +440,15 @@ void set_samba_nb_type(void); BOOL name_equal(struct nmb_name *n1,struct nmb_name *n2); BOOL ms_browser_name(char *name, int type); void remove_name(struct subnet_record *d, struct name_record *n); -struct name_record *find_name(struct name_record *n, - struct nmb_name *name, int search); -struct name_record *find_name_search(struct subnet_record **d, - struct nmb_name *name, - int search, struct in_addr ip); +struct name_record *find_name_on_subnet(struct subnet_record *d, + struct nmb_name *name, BOOL self_only); void dump_names(void); void load_netbios_names(void); void remove_netbios_name(struct subnet_record *d, - char *name,int type, enum name_source source, - struct in_addr ip); + char *name,int type, enum name_source source); struct name_record *add_netbios_entry(struct subnet_record *d, - char *name, int type, int nb_flags, - int ttl, enum name_source source, struct in_addr ip, - BOOL new_only,BOOL wins); + char *name, int type, int nb_flags, int ttl, + enum name_source source, struct in_addr ip, BOOL new_only); void expire_names(time_t t); /*The following definitions come from namedbresp.c */ @@ -486,9 +481,8 @@ void expire_servers(time_t t); /*The following definitions come from namedbsubnet.c */ -struct subnet_record *find_subnet(struct in_addr bcast_ip); -struct subnet_record *find_req_subnet(struct in_addr ip, BOOL bcast); -struct subnet_record *find_subnet_all(struct in_addr bcast_ip); +struct subnet_record *find_subnet(struct in_addr ip); +struct subnet_record *find_subnet_all(struct in_addr ip); void add_workgroup_to_subnet( struct subnet_record *d, char *group); void add_my_subnets(char *group); void write_browse_list(time_t t); |