Add option arg to IPv4 code.

svn path=/trunk/; revision=1662

diff --git a/driver.c b/driver.c
index a1bb1dd3e72d138058247687bb42bc5605caa3a1..5ed1e70a8b6a51b2d1e427e69e564c794adbeb7b 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -486,7 +486,7 @@ static int smtp_open(struct query *ctl)
 #endif /* INET6 */
            }
 
-           if ((ctl->smtp_socket = SockOpen(parsed_host,portnum)) == -1)
+           if ((ctl->smtp_socket = SockOpen(parsed_host,portnum,NULL)) == -1)
                continue;
 
            /* first, probe for ESMTP */
@@ -503,7 +503,7 @@ static int smtp_open(struct query *ctl)
            ctl->smtp_socket = -1;
 
            /* if opening for ESMTP failed, try SMTP */
-           if ((ctl->smtp_socket = SockOpen(parsed_host,portnum)) == -1)
+           if ((ctl->smtp_socket = SockOpen(parsed_host,portnum,NULL)) == -1)
                continue;
 
            if (SMTP_ok(ctl->smtp_socket) == SM_OK && 
@@ -1688,7 +1688,7 @@ const struct method *proto;       /* protocol method table */
                             ctl->server.service ? ctl->server.service : protocol->service,
                             ctl->server.netsec)) == -1)
 #else /* INET6 */
-       if ((sock = SockOpen(realhost, port)) == -1)
+       if ((sock = SockOpen(realhost, port, NULL)) == -1)
 #endif /* INET6 */
        {
 #if !INET6

diff --git a/socket.c b/socket.c
index 1f8733a9591a6f07a2f17ba3850cca48fa2e30ee..9fd0402403a7dab324d6b5c841ed885cd3f4acb8 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -73,7 +73,7 @@ int SockOpen(const char *host, const char *service, const char *options)
 #endif
 #endif /* INET_ATON */
 
-int SockOpen(const char *host, int clientPort)
+int SockOpen(const char *host, int clientPort, const char *options)
 {
     int sock;
 #ifndef INET_ATON
@@ -220,7 +220,7 @@ int SockPeek(int sock)
  */
 main()
 {
-    int                sock = SockOpen("localhost", 19);
+    int                sock = SockOpen("localhost", 19, NULL);
     char       buf[80];
 
     while (SockRead(sock, buf, sizeof(buf)-1))

diff --git a/socket.h b/socket.h
index b7d72a55638f763a163874070cfebde6a77e7be1..7e8441a80cee0add915926f303a6303f4d35d2d2 100644 (file)
--- a/socket.h
+++ b/socket.h
@@ -11,7 +11,7 @@
 #if INET6
 int SockOpen(const char *host, const char *service, const char *options);
 #else /* INET6 */
-int SockOpen(const char *host, int clientPort);
+int SockOpen(const char *host, int clientPort, const char *options);
 #endif /* INET6 */
 
 /*