summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-06-26 08:58:03 +0000
committerAndrew Tridgell <tridge@samba.org>2002-06-26 08:58:03 +0000
commit38bd5bf9eb18bfd4312ff81d566b4e9c90d7e07d (patch)
tree2a7fec9609c229a2298cc94dad48b18dbdb11ea6
parentb20ca8b8683e584d7a1843b07f262da34b6dca19 (diff)
downloadsamba-38bd5bf9eb18bfd4312ff81d566b4e9c90d7e07d.tar.gz
samba-38bd5bf9eb18bfd4312ff81d566b4e9c90d7e07d.tar.bz2
samba-38bd5bf9eb18bfd4312ff81d566b4e9c90d7e07d.zip
we never pass any userdata when doing name registrations on the
unicast subnet, so remove that parameter. That frees up userdata so I can start using it to indicate which wins server tag we are registering (more about wins 'tags' later ...) (This used to be commit 1324f0c185bb8cdb95fd497457223aff5e687bd6)
-rw-r--r--source3/nmbd/nmbd_nameregister.c105
1 files changed, 51 insertions, 54 deletions
diff --git a/source3/nmbd/nmbd_nameregister.c b/source3/nmbd/nmbd_nameregister.c
index cc1fac5577..fc16db9e49 100644
--- a/source3/nmbd/nmbd_nameregister.c
+++ b/source3/nmbd/nmbd_nameregister.c
@@ -253,8 +253,7 @@ responding.\n", inet_ntoa(rrec->packet->ip)));
static BOOL multihomed_register_name( struct nmb_name *nmbname, uint16 nb_flags,
register_name_success_function success_fn,
- register_name_fail_function fail_fn,
- struct userdata_struct *userdata)
+ register_name_fail_function fail_fn)
{
/*
If we are adding a group name, we just send multiple
@@ -276,55 +275,53 @@ static BOOL multihomed_register_name( struct nmb_name *nmbname, uint16 nb_flags,
will ever query names from us on this subnet).
*/
- int num_ips=0;
- int i;
- struct in_addr *ip_list = NULL;
- struct subnet_record *subrec;
-
- for(subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec) )
- num_ips++;
-
- if((ip_list = (struct in_addr *)malloc(num_ips * sizeof(struct in_addr)))==NULL)
- {
- DEBUG(0,("multihomed_register_name: malloc fail !\n"));
- return True;
- }
-
- for( subrec = FIRST_SUBNET, i = 0;
- subrec;
- subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec), i++ )
- ip_list[i] = subrec->myip;
-
- (void)add_name_to_subnet( unicast_subnet, nmbname->name, nmbname->name_type,
- nb_flags, lp_max_ttl(), SELF_NAME,
- num_ips, ip_list);
-
- /* Now try and register the name, num_ips times. On the last time use
- the given success and fail functions. */
-
- for( i = 0; i < num_ips; i++)
- {
- if(queue_register_multihomed_name( unicast_subnet,
- register_name_response,
- register_name_timeout_response,
- (i == num_ips - 1) ? success_fn : NULL,
- (i == num_ips - 1) ? fail_fn : NULL,
- (i == num_ips - 1) ? userdata : NULL,
- nmbname,
- nb_flags,
- ip_list[i]) == NULL)
- {
- DEBUG(0,("multihomed_register_name: Failed to send packet trying to \
+ int num_ips=0;
+ int i;
+ struct in_addr *ip_list = NULL;
+ struct subnet_record *subrec;
+
+ for(subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec) )
+ num_ips++;
+
+ if((ip_list = (struct in_addr *)malloc(num_ips * sizeof(struct in_addr)))==NULL) {
+ DEBUG(0,("multihomed_register_name: malloc fail !\n"));
+ return True;
+ }
+
+ for( subrec = FIRST_SUBNET, i = 0;
+ subrec;
+ subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec), i++ ) {
+ ip_list[i] = subrec->myip;
+ }
+
+ (void)add_name_to_subnet( unicast_subnet, nmbname->name, nmbname->name_type,
+ nb_flags, lp_max_ttl(), SELF_NAME,
+ num_ips, ip_list);
+
+ /* Now try and register the name, num_ips times. On the last time use
+ the given success and fail functions. */
+
+ for (i = 0; i < num_ips; i++) {
+ if (queue_register_multihomed_name( unicast_subnet,
+ register_name_response,
+ register_name_timeout_response,
+ (i == num_ips - 1) ? success_fn : NULL,
+ (i == num_ips - 1) ? fail_fn : NULL,
+ NULL,
+ nmbname,
+ nb_flags,
+ ip_list[i]) == NULL) {
+ DEBUG(0,("multihomed_register_name: Failed to send packet trying to \
register name %s IP %s\n", nmb_namestr(nmbname), inet_ntoa(ip_list[i]) ));
-
- SAFE_FREE(ip_list);
- return True;
- }
- }
-
- SAFE_FREE(ip_list);
-
- return False;
+
+ SAFE_FREE(ip_list);
+ return True;
+ }
+ }
+
+ SAFE_FREE(ip_list);
+
+ return False;
}
/****************************************************************************
@@ -350,10 +347,10 @@ BOOL register_name(struct subnet_record *subrec,
/* If this is the unicast subnet, and we are a multi-homed
host, then register a multi-homed name. */
- if( (subrec == unicast_subnet) && we_are_multihomed())
- return multihomed_register_name(&nmbname, nb_flags,
- success_fn, fail_fn,
- userdata);
+ if( (subrec == unicast_subnet) && we_are_multihomed()) {
+ return multihomed_register_name(&nmbname, nb_flags,
+ success_fn, fail_fn);
+ }
if(queue_register_name( subrec,
register_name_response,