Fix another segfault and make smbfilter run again.

[ira/wip.git] / source3 / utils / smbfilter.c

diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index 3665647905d9aac9bf8152529e1bc46bc87e7d9f..79b887388854627cbfa397117c152f59e871fcea 100644 (file)
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -5,7 +5,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,
@@ -14,8 +14,7 @@
    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"
@@ -116,15 +115,21 @@ static void filter_request(char *buf)
 }
 
 
-static void filter_child(int c, struct in_addr dest_ip)
+static void filter_child(int c, struct sockaddr_storage *dest_ss)
 {
        int s;
 
        /* we have a connection from a new client, now connect to the server */
-       s = open_socket_out(SOCK_STREAM, &dest_ip, 445, LONG_CONNECT_TIMEOUT);
+       s = open_socket_out(SOCK_STREAM, dest_ss, 445, LONG_CONNECT_TIMEOUT);
 
        if (s == -1) {
-               d_printf("Unable to connect to %s\n", inet_ntoa(dest_ip));
+               char addr[INET6_ADDRSTRLEN];
+               if (dest_ss) {
+                       print_sockaddr(addr, sizeof(addr), dest_ss);
+               }
+
+               d_printf("Unable to connect to %s (%s)\n",
+                        dest_ss?addr:"NULL",strerror(errno));
                exit(1);
        }
 
@@ -140,7 +145,7 @@ static void filter_child(int c, struct in_addr dest_ip)
                if (num <= 0) continue;
                
                if (c != -1 && FD_ISSET(c, &fds)) {
-                       if (!receive_smb(c, packet, 0)) {
+                       if (!receive_smb(c, packet, 0, NULL)) {
                                d_printf("client closed connection\n");
                                exit(0);
                        }
@@ -151,7 +156,7 @@ static void filter_child(int c, struct in_addr dest_ip)
                        }                       
                }
                if (s != -1 && FD_ISSET(s, &fds)) {
-                       if (!receive_smb(s, packet, 0)) {
+                       if (!receive_smb(s, packet, 0, NULL)) {
                                d_printf("server closed connection\n");
                                exit(0);
                        }
@@ -170,12 +175,14 @@ static void filter_child(int c, struct in_addr dest_ip)
 static void start_filter(char *desthost)
 {
        int s, c;
-       struct in_addr dest_ip;
+       struct sockaddr_storage dest_ss;
+       struct sockaddr_storage my_ss;
 
        CatchChild();
 
        /* start listening on port 445 locally */
-       s = open_socket_in(SOCK_STREAM, 445, 0, 0, True);
+       my_ss.ss_family = AF_INET;
+       s = open_socket_in(SOCK_STREAM, 445, 0, &my_ss, True);
        
        if (s == -1) {
                d_printf("bind failed\n");
@@ -186,7 +193,7 @@ static void start_filter(char *desthost)
                d_printf("listen failed\n");
        }
 
-       if (!resolve_name(desthost, &dest_ip, 0x20)) {
+       if (!resolve_name(desthost, &dest_ss, 0x20)) {
                d_printf("Unable to resolve host %s\n", desthost);
                exit(1);
        }
@@ -194,19 +201,19 @@ static void start_filter(char *desthost)
        while (1) {
                fd_set fds;
                int num;
-               struct sockaddr addr;
-               socklen_t in_addrlen = sizeof(addr);
+               struct sockaddr_storage ss;
+               socklen_t in_addrlen = sizeof(ss);
                
                FD_ZERO(&fds);
                FD_SET(s, &fds);
 
                num = sys_select_intr(s+1,&fds,NULL,NULL,NULL);
                if (num > 0) {
-                       c = accept(s, &addr, &in_addrlen);
+                       c = accept(s, (struct sockaddr *)&ss, &in_addrlen);
                        if (c != -1) {
                                if (fork() == 0) {
                                        close(s);
-                                       filter_child(c, dest_ip);
+                                       filter_child(c, &dest_ss);
                                        exit(0);
                                } else {
                                        close(c);
@@ -221,6 +228,9 @@ int main(int argc, char *argv[])
 {
        char *desthost;
        pstring configfile;
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       load_case_tables();
 
        setup_logging(argv[0],True);
   
@@ -236,10 +246,11 @@ int main(int argc, char *argv[])
                netbiosname = argv[2];
        }
 
-       if (!lp_load(configfile,True,False,False)) {
+       if (!lp_load(configfile,True,False,False,True)) {
                d_printf("Unable to load config file\n");
        }
 
        start_filter(desthost);
+       TALLOC_FREE(frame);
        return 0;
 }