Protocol structure can now specify the default port.

diff --git a/src/include/proto.h b/src/include/proto.h
index 38658ac8fa253132ea90cbab900cb861def52a00..2c157ee4e05ae3e7ca1d589dbfb8af4a874c0c9d 100644 (file)
--- a/src/include/proto.h
+++ b/src/include/proto.h
@@ -2,9 +2,11 @@
 #define PROTO_H
 
 #include "tables.h"
+#include "in.h"
 
 struct protocol {
        char *name;
+       in_port_t default_port;
        int ( * load ) ( char *url,
                         struct sockaddr_in *server,
                         char *file,

diff --git a/src/proto/nfs.c b/src/proto/nfs.c
index 7d3280002db45e56db05b610d493e4f65fbe8355..37331a957b2881c2b25602ad27a3cbe82ec1165c 100644 (file)
--- a/src/proto/nfs.c
+++ b/src/proto/nfs.c
@@ -103,9 +103,6 @@ static int rpc_lookup(struct sockaddr_in *addr, int prog, int ver, int sport)
        *p++ = htonl(ver);
        *p++ = htonl(IP_UDP);
        *p++ = 0;
-       if ( ! addr->sin_port ) {
-               addr->sin_port = SUNRPC_PORT;
-       }
        for (retries = 0; retries < MAX_RPC_RETRIES; retries++) {
                long timeout;
                udp_transmit(addr->sin_addr.s_addr, sport, addr->sin_port,
@@ -623,5 +620,7 @@ nfssymlink:
 INIT_FN ( INIT_RPC, rpc_init, nfs_reset, nfs_reset );
 
 static struct protocol nfs_protocol __protocol = {
-       "nfs", nfs
+       .name = "nfs",
+       .default_port = SUNRPC_PORT,
+       .load = nfs,
 };

diff --git a/src/proto/slam.c b/src/proto/slam.c
index 4ea296b8ef3baa13fabc9a48cccab48d6d6e3bb3..09d53172c3de47292443a651b1bebd217db1fc3a 100644 (file)
--- a/src/proto/slam.c
+++ b/src/proto/slam.c
@@ -516,8 +516,6 @@ static int url_slam ( char *url __unused,
        struct slam_info info;
        /* Set the defaults */
        info.server = *server;
-       if ( ! info.server.sin_port )
-               info.server.sin_port = SLAM_PORT;
        info.multicast.sin_addr.s_addr = htonl(SLAM_MULTICAST_IP);
        info.multicast.sin_port      = SLAM_MULTICAST_PORT;
        info.local.sin_addr.s_addr   = arptable[ARP_CLIENT].ipaddr.s_addr;
@@ -532,5 +530,7 @@ static int url_slam ( char *url __unused,
 }
 
 static struct protocol slam_protocol __protocol = {
-       "x-slam", url_slam
+       .name = "x-slam",
+       .default_port = SLAM_PORT,
+       .load = url_slam,
 };

diff --git a/src/proto/tftm.c b/src/proto/tftm.c
index 396be42295bbcb3ac78873811a4a55cf9b69f613..b96736a163792bd32f07f2d6af844ccc476788fb 100644 (file)
--- a/src/proto/tftm.c
+++ b/src/proto/tftm.c
@@ -391,8 +391,6 @@ static int url_tftm ( char *url __unused,
 
        /* Set the defaults */
        info.server = *server;
-       if ( ! info.server.sin_port )
-               info.server.sin_port = TFTM_PORT;
        info.local.sin_addr.s_addr = arptable[ARP_CLIENT].ipaddr.s_addr;
        info.local.sin_port = TFTM_PORT; /* Does not matter. */
        info.multicast = info.local;
@@ -482,5 +480,7 @@ static int opt_get_multicast(struct tftp_t *tr, unsigned short *len,
 }
 
 static struct protocol tftm_protocol __protocol = {
-       "x-tftm", url_tftm
+       .name = "x-tftm",
+       .default_port = TFTM_PORT,
+       .load = url_tftm,
 };

diff --git a/src/proto/tftp.c b/src/proto/tftp.c
index 9c0e55638e487b34a3cfd28e9d17f339cdd0386f..c59807d7b580ba66b74dcf612d986cd27fe0f665 100644 (file)
--- a/src/proto/tftp.c
+++ b/src/proto/tftp.c
@@ -50,8 +50,6 @@ int tftp_block ( struct tftpreq_info_t *request,
                blksize = TFTP_DEFAULTSIZE_PACKET;
                lport++; /* Use new local port */
                server = *(request->server);
-               if ( ! server.sin_port )
-                       server.sin_port = TFTP_PORT;
                if ( !udp_transmit(server.sin_addr.s_addr, lport,
                                   server.sin_port, xmitlen, &xmit) )
                        return (0);
@@ -170,5 +168,7 @@ int tftp ( char *url __unused,
 }
 
 struct protocol tftp_protocol __default_protocol = {
-       "tftp", tftp
+       .name = "tftp",
+       .default_port = TFTP_PORT,
+       .load = tftp,
 };