r25398: Parse loadparm context to all lp_*() functions.

[kai/samba.git] / source4 / nbt_server / wins / winsclient.c

diff --git a/source4/nbt_server/wins/winsclient.c b/source4/nbt_server/wins/winsclient.c
index 6bf328d1466edebb9f09e40c4a57a262a6c134cd..1dd934cc92bea18f2878e6c286a7f553b292f1cc 100644 (file)
--- a/source4/nbt_server/wins/winsclient.c
+++ b/source4/nbt_server/wins/winsclient.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,16 +16,19 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
+#include "nbt_server/wins/winsserver.h"
 #include "libcli/composite/composite.h"
 #include "lib/events/events.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "smbd/service_task.h"
+#include "param/param.h"
 
+static void nbtd_wins_refresh_handler(struct composite_context *c);
 
 /* we send WINS client requests using our primary network interface 
 */
@@ -49,6 +52,21 @@ static void nbtd_wins_register_retry(struct event_context *ev, struct timed_even
        nbtd_winsclient_register(iname);
 }
 
+/*
+  start a timer to refresh this name
+*/
+static void nbtd_wins_start_refresh_timer(struct nbtd_iface_name *iname)
+{
+       uint32_t refresh_time;
+       uint32_t max_refresh_time = lp_parm_int(NULL, "nbtd", "max_refresh_time", 7200);
+
+       refresh_time = MIN(max_refresh_time, iname->ttl/2);
+       
+       event_add_timed(iname->iface->nbtsrv->task->event_ctx, 
+                       iname, 
+                       timeval_add(&iname->registration_time, refresh_time, 0),
+                       nbtd_wins_refresh, iname);
+}
 
 /*
   called when a wins name refresh has completed
@@ -93,16 +111,16 @@ static void nbtd_wins_refresh_handler(struct composite_context *c)
        /* success - start a periodic name refresh */
        iname->nb_flags |= NBT_NM_ACTIVE;
        if (iname->wins_server) {
-               talloc_free(iname->wins_server);
+               /*
+                * talloc_free() would generate a warning,
+                * so steal it into the tmp context
+                */
+               talloc_steal(tmp_ctx, iname->wins_server);
        }
        iname->wins_server = talloc_steal(iname, io.out.wins_server);
 
        iname->registration_time = timeval_current();
-       event_add_timed(iname->iface->nbtsrv->task->event_ctx, 
-                       iname,
-                       timeval_add(&iname->registration_time, iname->ttl/2, 0),
-                       nbtd_wins_refresh,
-                       iname);
+       nbtd_wins_start_refresh_timer(iname);
 
        talloc_free(tmp_ctx);
 }
@@ -161,7 +179,7 @@ static void nbtd_wins_register_handler(struct composite_context *c)
        if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
                /* none of the WINS servers responded - try again 
                   periodically */
-               int wins_retry_time = lp_parm_int(-1, "nbtd", "wins_retry", 300);
+               int wins_retry_time = lp_parm_int(NULL, "nbtd", "wins_retry", 300);
                event_add_timed(iname->iface->nbtsrv->task->event_ctx, 
                                iname,
                                timeval_current_ofs(wins_retry_time, 0),
@@ -190,16 +208,16 @@ static void nbtd_wins_register_handler(struct composite_context *c)
        /* success - start a periodic name refresh */
        iname->nb_flags |= NBT_NM_ACTIVE;
        if (iname->wins_server) {
-               talloc_free(iname->wins_server);
+               /*
+                * talloc_free() would generate a warning,
+                * so steal it into the tmp context
+                */
+               talloc_steal(tmp_ctx, iname->wins_server);
        }
        iname->wins_server = talloc_steal(iname, io.out.wins_server);
 
        iname->registration_time = timeval_current();
-       event_add_timed(iname->iface->nbtsrv->task->event_ctx, 
-                       iname,
-                       timeval_add(&iname->registration_time, iname->ttl/2, 0),
-                       nbtd_wins_refresh,
-                       iname);
+       nbtd_wins_start_refresh_timer(iname);
 
        DEBUG(3,("Registered %s with WINS server %s\n",
                 nbt_name_string(tmp_ctx, &iname->name), iname->wins_server));
@@ -218,7 +236,7 @@ void nbtd_winsclient_register(struct nbtd_iface_name *iname)
 
        /* setup a wins name register request */
        io.in.name            = iname->name;
-       io.in.wins_servers    = lp_wins_server_list();
+       io.in.wins_servers    = lp_wins_server_list(global_loadparm);
        io.in.addresses       = nbtd_address_list(iface, iname);
        io.in.nb_flags        = iname->nb_flags;
        io.in.ttl             = iname->ttl;