r10656: BIG merge from trunk. Features not copied over

[tprouty/samba.git] / source3 / nmbd / nmbd.c

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 880de7f91bf26ce4a318c0ff8934a508aa3e4e34..fcaba03b3dbaad5ce42eb4c53e45018c27dab2a9 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -27,8 +27,12 @@ int ClientNMB       = -1;
 int ClientDGRAM     = -1;
 int global_nmb_port = -1;
 
+extern BOOL rescan_listen_set;
+extern struct in_addr loopback_ip;
 extern BOOL global_in_nmbd;
 
+extern BOOL override_logfile;
+
 /* are we running as a daemon ? */
 static BOOL is_daemon;
 
@@ -72,7 +76,8 @@ static void terminate(void)
  Handle a SHUTDOWN message from smbcontrol.
  **************************************************************************** */
 
-static void nmbd_terminate(int msg_type, pid_t src, void *buf, size_t len)
+static void nmbd_terminate(int msg_type, struct process_id src,
+                          void *buf, size_t len)
 {
        terminate();
 }
@@ -86,7 +91,7 @@ static SIG_ATOMIC_T got_sig_term;
 static void sig_term(int sig)
 {
        got_sig_term = 1;
-       sys_select_signal();
+       sys_select_signal(SIGTERM);
 }
 
 /**************************************************************************** **
@@ -98,7 +103,7 @@ static SIG_ATOMIC_T reload_after_sighup;
 static void sig_hup(int sig)
 {
        reload_after_sighup = 1;
-       sys_select_signal();
+       sys_select_signal(SIGHUP);
 }
 
 #if DUMP_CORE
@@ -194,8 +199,6 @@ static BOOL reload_interfaces(time_t t)
        static time_t lastt;
        int n;
        struct subnet_record *subrec;
-       extern BOOL rescan_listen_set;
-       extern struct in_addr loopback_ip;
 
        if (t && ((t - lastt) < NMBD_INTERFACES_RELOAD)) return False;
        lastt = t;
@@ -305,7 +308,8 @@ static BOOL reload_nmbd_services(BOOL test)
  * detects that there are no subnets.
  **************************************************************************** */
 
-static void msg_reload_nmbd_services(int msg_type, pid_t src, void *buf, size_t len)
+static void msg_reload_nmbd_services(int msg_type, struct process_id src,
+                                    void *buf, size_t len)
 {
        write_browse_list( 0, True );
        dump_all_namelists();
@@ -321,6 +325,58 @@ static void msg_reload_nmbd_services(int msg_type, pid_t src, void *buf, size_t
        }
 }
 
+static void msg_nmbd_send_packet(int msg_type, struct process_id src,
+                                void *buf, size_t len)
+{
+       struct packet_struct *p = (struct packet_struct *)buf;
+       struct subnet_record *subrec;
+       struct in_addr *local_ip;
+
+       DEBUG(10, ("Received send_packet from %d\n", procid_to_pid(&src)));
+
+       if (len != sizeof(struct packet_struct)) {
+               DEBUG(2, ("Discarding invalid packet length from %d\n",
+                         procid_to_pid(&src)));
+               return;
+       }
+
+       if ((p->packet_type != NMB_PACKET) &&
+           (p->packet_type != DGRAM_PACKET)) {
+               DEBUG(2, ("Discarding invalid packet type from %d: %d\n",
+                         procid_to_pid(&src), p->packet_type));
+               return;
+       }
+
+       local_ip = iface_ip(p->ip);
+
+       if (local_ip == NULL) {
+               DEBUG(2, ("Could not find ip for packet from %d\n",
+                         procid_to_pid(&src)));
+               return;
+       }
+
+       subrec = FIRST_SUBNET;
+
+       p->fd = (p->packet_type == NMB_PACKET) ?
+               subrec->nmb_sock : subrec->dgram_sock;
+
+       for (subrec = FIRST_SUBNET; subrec != NULL;
+            subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
+               if (ip_equal(*local_ip, subrec->myip)) {
+                       p->fd = (p->packet_type == NMB_PACKET) ?
+                               subrec->nmb_sock : subrec->dgram_sock;
+                       break;
+               }
+       }
+
+       if (p->packet_type == DGRAM_PACKET) {
+               p->port = 138;
+               p->packet.dgram.header.source_ip.s_addr = local_ip->s_addr;
+               p->packet.dgram.header.source_port = 138;
+       }
+
+       send_packet(p);
+}
 
 /**************************************************************************** **
  The main select loop.
@@ -538,7 +594,8 @@ static void process(void)
 
                if(reload_after_sighup) {
                        DEBUG( 0, ( "Got SIGHUP dumping debug info.\n" ) );
-                       msg_reload_nmbd_services(MSG_SMB_CONF_UPDATED, (pid_t) 0, (void*) &no_subnets, 0);
+                       msg_reload_nmbd_services(MSG_SMB_CONF_UPDATED,
+                                                pid_to_procid(0), (void*) &no_subnets, 0);
                        if(no_subnets)
                                return;
                        reload_after_sighup = 0;
@@ -598,7 +655,6 @@ static BOOL open_sockets(BOOL isdaemon, int port)
        pstring logfile;
        static BOOL opt_interactive;
        poptContext pc;
-       int opt;
        struct poptOption long_options[] = {
        POPT_AUTOHELP
        {"daemon", 'D', POPT_ARG_VAL, &is_daemon, True, "Become a daemon(default)" },
@@ -614,7 +670,7 @@ static BOOL open_sockets(BOOL isdaemon, int port)
        global_nmb_port = NMB_PORT;
 
        pc = poptGetContext("nmbd", argc, argv, long_options, 0);
-       while ((opt = poptGetNextOpt(pc)) != -1) ;
+       while (poptGetNextOpt(pc) != -1) {};
        poptFreeContext(pc);
 
        global_in_nmbd = True;
@@ -623,8 +679,10 @@ static BOOL open_sockets(BOOL isdaemon, int port)
        
        sys_srandom(time(NULL) ^ sys_getpid());
        
-       slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", dyn_LOGFILEBASE);
-       lp_set_logfile(logfile);
+       if (!override_logfile) {
+               slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", dyn_LOGFILEBASE);
+               lp_set_logfile(logfile);
+       }
        
        fault_setup((void (*)(void *))fault_continue );
        
@@ -716,6 +774,7 @@ static BOOL open_sockets(BOOL isdaemon, int port)
        message_register(MSG_WINS_NEW_ENTRY, nmbd_wins_new_entry);
        message_register(MSG_SHUTDOWN, nmbd_terminate);
        message_register(MSG_SMB_CONF_UPDATED, msg_reload_nmbd_services);
+       message_register(MSG_SEND_PACKET, msg_nmbd_send_packet);
 
        DEBUG( 3, ( "Opening sockets %d\n", global_nmb_port ) );