10 files changed, 404 insertions, 495 deletions
diff --git a/rpc/rpc-lib/src/auth-glusterfs.c b/rpc/rpc-lib/src/auth-glusterfs.c
index 4748a318e74..459cad87791 100644
--- a/rpc/rpc-lib/src/auth-glusterfs.c
+++ b/rpc/rpc-lib/src/auth-glusterfs.c
@@ -180,7 +180,7 @@ err:
 }
 
 rpcsvc_auth_ops_t auth_glusterfs_ops = {
-        .conn_init              = NULL,
+        .transport_init         = NULL,
         .request_init           = auth_glusterfs_request_init,
         .authenticate           = auth_glusterfs_authenticate
 };
diff --git a/rpc/rpc-lib/src/auth-null.c b/rpc/rpc-lib/src/auth-null.c
index bfdabaa840c..20dd7e77c8b 100644
--- a/rpc/rpc-lib/src/auth-null.c
+++ b/rpc/rpc-lib/src/auth-null.c
@@ -50,7 +50,7 @@ int auth_null_authenticate (rpcsvc_request_t *req, void *priv)
 }
 
 rpcsvc_auth_ops_t auth_null_ops = {
-        .conn_init              = NULL,
+        .transport_init              = NULL,
         .request_init           = auth_null_request_init,
         .authenticate           = auth_null_authenticate
 };
diff --git a/rpc/rpc-lib/src/auth-unix.c b/rpc/rpc-lib/src/auth-unix.c
index 4e99c1a5b6f..30b395bd4fa 100644
--- a/rpc/rpc-lib/src/auth-unix.c
+++ b/rpc/rpc-lib/src/auth-unix.c
@@ -70,7 +70,7 @@ err:
 }
 
 rpcsvc_auth_ops_t auth_unix_ops = {
-        .conn_init              = NULL,
+        .transport_init              = NULL,
         .request_init           = auth_unix_request_init,
         .authenticate           = auth_unix_authenticate
 };
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index da25d33c1ed..bac8b0246a8 100644
--- a/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
@@ -418,7 +418,9 @@ rpc_clnt_fill_request_info (struct rpc_clnt *clnt, rpc_request_info_t *info)
 
         if (ret == -1) {
                 gf_log ("rpc-clnt", GF_LOG_CRITICAL, "cannot lookup the saved "
-                        "frame corresponding to xid (%d)", info->xid);
+                        "frame corresponding to xid (%d) for msg arrived on "
+                        "transport %s",
+                        info->xid, clnt->conn.trans->name);
                 goto out;
         }
 
@@ -1268,6 +1270,7 @@ rpc_clnt_submit (struct rpc_clnt *rpc, rpc_clnt_prog_t *prog,
                 req.rsp.rsp_payload = rsp_payload;
                 req.rsp.rsp_payload_count = rsp_payload_count;
                 req.rsp.rsp_iobref = rsp_iobref;
+                req.rpc_req = rpcreq;
 
                 ret = rpc_transport_submit_request (rpc->conn.trans,
                                                     &req);
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index 200ff383052..e3bc519fc97 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -587,7 +587,7 @@ validate_volume_options (char *name, dict_t *options, volume_option_t *opt)
 
 int32_t
 rpc_transport_get_myaddr (rpc_transport_t *this, char *peeraddr, int addrlen,
-                          struct sockaddr *sa, size_t salen)
+                          struct sockaddr_storage *sa, size_t salen)
 {
         if (!this)
                 return -1;
@@ -614,7 +614,7 @@ rpc_transport_get_peername (rpc_transport_t *this, char *hostname, int hostlen)
 
 int32_t
 rpc_transport_get_peeraddr (rpc_transport_t *this, char *peeraddr, int addrlen,
-                            struct sockaddr *sa, size_t salen)
+                            struct sockaddr_storage *sa, size_t salen)
 {
         if (!this)
                 return -1;
diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h
index 7ef3abb7320..a6a3441dcdd 100644
--- a/rpc/rpc-lib/src/rpc-transport.h
+++ b/rpc/rpc-lib/src/rpc-transport.h
@@ -125,8 +125,9 @@ struct rpc_transport_rsp {
 typedef struct rpc_transport_rsp rpc_transport_rsp_t;
 
 struct rpc_transport_req {
-        rpc_transport_msg_t msg;
-        rpc_transport_rsp_t rsp;
+        rpc_transport_msg_t  msg;
+        rpc_transport_rsp_t  rsp;
+        struct rpc_req      *rpc_req;
 };
 typedef struct rpc_transport_req rpc_transport_req_t;
 
@@ -168,6 +169,11 @@ typedef int (*rpc_transport_notify_t) (rpc_transport_t *, void *mydata,
                                        rpc_transport_event_t, void *data, ...);
 struct rpc_transport {
 	struct rpc_transport_ops  *ops;
+        rpc_transport_t           *listener; /* listener transport to which
+                                              * request for creation of this
+                                              * transport came from. valid only
+                                              * on server process.
+                                              */
 	void                      *private;
         void                      *xl_private;
         void                      *xl;       /* Used for THIS */
@@ -202,12 +208,12 @@ struct rpc_transport_ops {
         int32_t (*get_peername)   (rpc_transport_t *this, char *hostname,
                                    int hostlen);
         int32_t (*get_peeraddr)   (rpc_transport_t *this, char *peeraddr,
-                                   int addrlen, struct sockaddr *sa,
+                                   int addrlen, struct sockaddr_storage *sa,
                                    socklen_t sasize);
         int32_t (*get_myname)     (rpc_transport_t *this, char *hostname,
                                    int hostlen);
         int32_t (*get_myaddr)     (rpc_transport_t *this, char *peeraddr,
-                                   int addrlen, struct sockaddr *sa,
+                                   int addrlen, struct sockaddr_storage *sa,
                                    socklen_t sasize);
 };
 
@@ -253,14 +259,14 @@ rpc_transport_get_peername (rpc_transport_t *this, char *hostname, int hostlen);
 
 int32_t
 rpc_transport_get_peeraddr (rpc_transport_t *this, char *peeraddr, int addrlen,
-                            struct sockaddr *sa, size_t salen);
+                            struct sockaddr_storage *sa, size_t salen);
 
 int32_t
 rpc_transport_get_myname (rpc_transport_t *this, char *hostname, int hostlen);
 
 int32_t
 rpc_transport_get_myaddr (rpc_transport_t *this, char *peeraddr, int addrlen,
-                          struct sockaddr *sa, size_t salen);
+                          struct sockaddr_storage *sa, size_t salen);
 
 rpc_transport_pollin_t *
 rpc_transport_pollin_alloc (rpc_transport_t *this, struct iovec *vector,
diff --git a/rpc/rpc-lib/src/rpcsvc-auth.c b/rpc/rpc-lib/src/rpcsvc-auth.c
index d14b91f3a01..5cfa255ba95 100644
--- a/rpc/rpc-lib/src/rpcsvc-auth.c
+++ b/rpc/rpc-lib/src/rpcsvc-auth.c
@@ -210,7 +210,7 @@ __rpcsvc_auth_get_handler (rpcsvc_request_t *req)
         if (!req)
                 return NULL;
 
-        svc = rpcsvc_request_service (req);
+        svc = req->svc;
         if (!svc) {
                 gf_log (GF_RPCSVC, GF_LOG_ERROR, "!svc");
                 goto err;
diff --git a/rpc/rpc-lib/src/rpcsvc-common.h b/rpc/rpc-lib/src/rpcsvc-common.h
index aef791cfa0d..7e72bc3ae44 100644
--- a/rpc/rpc-lib/src/rpcsvc-common.h
+++ b/rpc/rpc-lib/src/rpcsvc-common.h
@@ -62,8 +62,6 @@ typedef struct rpcsvc_state {
 
         glusterfs_ctx_t         *ctx;
 
-        void                    *listener;
-
         /* list of connections which will listen for incoming connections */
         struct list_head         listeners;
 
@@ -76,7 +74,7 @@ typedef struct rpcsvc_state {
 
         void                    *mydata; /* This is xlator */
         rpcsvc_notify_t          notifyfn;
-
+        struct mem_pool         *rxpool;
 } rpcsvc_t;
 
 
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index 57e9b12aaa6..82a19bbd19d 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -48,16 +48,17 @@
 
 struct rpcsvc_program gluster_dump_prog;
 
-
-#define rpcsvc_alloc_request(con, request)                              \
+#define rpcsvc_alloc_request(svc, request)                              \
         do {                                                            \
-                request = (rpcsvc_request_t *) mem_get ((con)->rxpool); \
+                request = (rpcsvc_request_t *) mem_get ((svc)->rxpool); \
                 memset (request, 0, sizeof (rpcsvc_request_t));         \
         } while (0)
 
+rpcsvc_listener_t *
+rpcsvc_get_listener (rpcsvc_t *svc, uint16_t port, rpc_transport_t *trans);
 
 int
-rpcsvc_conn_peer_check_search (dict_t *options, char *pattern, char *clstr)
+rpcsvc_transport_peer_check_search (dict_t *options, char *pattern, char *clstr)
 {
         int                     ret = -1;
         char                    *addrtok = NULL;
@@ -103,7 +104,7 @@ err:
 
 
 int
-rpcsvc_conn_peer_check_allow (dict_t *options, char *volname, char *clstr)
+rpcsvc_transport_peer_check_allow (dict_t *options, char *volname, char *clstr)
 {
         int     ret = RPCSVC_AUTH_DONTCARE;
         char    *srchstr = NULL;
@@ -126,7 +127,7 @@ rpcsvc_conn_peer_check_allow (dict_t *options, char *volname, char *clstr)
         } else
                 srchstr = globalrule;
 
-        ret = rpcsvc_conn_peer_check_search (options, srchstr, clstr);
+        ret = rpcsvc_transport_peer_check_search (options, srchstr, clstr);
         if (volname)
                 GF_FREE (srchstr);
 
@@ -139,7 +140,7 @@ out:
 }
 
 int
-rpcsvc_conn_peer_check_reject (dict_t *options, char *volname, char *clstr)
+rpcsvc_transport_peer_check_reject (dict_t *options, char *volname, char *clstr)
 {
         int     ret = RPCSVC_AUTH_DONTCARE;
         char    *srchstr = NULL;
@@ -158,7 +159,7 @@ rpcsvc_conn_peer_check_reject (dict_t *options, char *volname, char *clstr)
         } else
                 srchstr = generalrule;
 
-        ret = rpcsvc_conn_peer_check_search (options, srchstr, clstr);
+        ret = rpcsvc_transport_peer_check_search (options, srchstr, clstr);
         if (volname)
                 GF_FREE (srchstr);
 
@@ -301,18 +302,18 @@ rpcsvc_combine_gen_spec_volume_checks (int gen, int spec)
 
 
 int
-rpcsvc_conn_peer_check_name (dict_t *options, char *volname,
-                             rpcsvc_conn_t *conn)
+rpcsvc_transport_peer_check_name (dict_t *options, char *volname,
+                                  rpc_transport_t *trans)
 {
         int     ret = RPCSVC_AUTH_REJECT;
         int     aret = RPCSVC_AUTH_REJECT;
         int     rjret = RPCSVC_AUTH_REJECT;
         char    clstr[RPCSVC_PEER_STRLEN];
 
-        if (!conn)
+        if (!trans)
                 return ret;
 
-        ret = rpcsvc_conn_peername (conn, clstr, RPCSVC_PEER_STRLEN);
+        ret = rpc_transport_get_peername (trans, clstr, RPCSVC_PEER_STRLEN);
         if (ret != 0) {
                 gf_log (GF_RPCSVC, GF_LOG_ERROR, "Failed to get remote addr: "
                         "%s", gai_strerror (ret));
@@ -320,8 +321,8 @@ rpcsvc_conn_peer_check_name (dict_t *options, char *volname,
                 goto err;
         }
 
-        aret = rpcsvc_conn_peer_check_allow (options, volname, clstr);
-        rjret = rpcsvc_conn_peer_check_reject (options, volname, clstr);
+        aret = rpcsvc_transport_peer_check_allow (options, volname, clstr);
+        rjret = rpcsvc_transport_peer_check_reject (options, volname, clstr);
 
         ret = rpcsvc_combine_allow_reject_volume_check (aret, rjret);
 
@@ -331,17 +332,19 @@ err:
 
 
 int
-rpcsvc_conn_peer_check_addr (dict_t *options, char *volname,rpcsvc_conn_t *conn)
+rpcsvc_transport_peer_check_addr (dict_t *options, char *volname,
+                                  rpc_transport_t *trans)
 {
         int     ret = RPCSVC_AUTH_REJECT;
         int     aret = RPCSVC_AUTH_DONTCARE;
         int     rjret = RPCSVC_AUTH_REJECT;
         char    clstr[RPCSVC_PEER_STRLEN];
 
-        if (!conn)
+        if (!trans)
                 return ret;
 
-        ret = rpcsvc_conn_peeraddr (conn, clstr, RPCSVC_PEER_STRLEN, NULL, 0);
+        ret = rpcsvc_transport_peeraddr (trans, clstr, RPCSVC_PEER_STRLEN, NULL,
+                                         0);
         if (ret != 0) {
                 gf_log (GF_RPCSVC, GF_LOG_ERROR, "Failed to get remote addr: "
                         "%s", gai_strerror (ret));
@@ -349,8 +352,8 @@ rpcsvc_conn_peer_check_addr (dict_t *options, char *volname,rpcsvc_conn_t *conn)
                 goto err;
         }
 
-        aret = rpcsvc_conn_peer_check_allow (options, volname, clstr);
-        rjret = rpcsvc_conn_peer_check_reject (options, volname, clstr);
+        aret = rpcsvc_transport_peer_check_allow (options, volname, clstr);
+        rjret = rpcsvc_transport_peer_check_reject (options, volname, clstr);
 
         ret = rpcsvc_combine_allow_reject_volume_check (aret, rjret);
 err:
@@ -359,8 +362,8 @@ err:
 
 
 int
-rpcsvc_conn_check_volume_specific (dict_t *options, char *volname,
-                                   rpcsvc_conn_t *conn)
+rpcsvc_transport_check_volume_specific (dict_t *options, char *volname,
+                                        rpc_transport_t *trans)
 {
         int             namechk = RPCSVC_AUTH_REJECT;
         int             addrchk = RPCSVC_AUTH_REJECT;
@@ -368,7 +371,7 @@ rpcsvc_conn_check_volume_specific (dict_t *options, char *volname,
         char            *namestr = NULL;
         int             ret = 0;
 
-        if ((!options) || (!volname) || (!conn))
+        if ((!options) || (!volname) || (!trans))
                 return RPCSVC_AUTH_REJECT;
 
         /* Enabled by default */
@@ -389,8 +392,9 @@ rpcsvc_conn_check_volume_specific (dict_t *options, char *volname,
          * specific which will over-ride the network address rules.
          */
         if (namelookup)
-                namechk = rpcsvc_conn_peer_check_name (options, volname, conn);
-        addrchk = rpcsvc_conn_peer_check_addr (options, volname, conn);
+                namechk = rpcsvc_transport_peer_check_name (options, volname,
+                                                            trans);
+        addrchk = rpcsvc_transport_peer_check_addr (options, volname, trans);
 
         if (namelookup)
                 ret = rpcsvc_combine_gen_spec_addr_checks (addrchk, namechk);
@@ -402,7 +406,7 @@ rpcsvc_conn_check_volume_specific (dict_t *options, char *volname,
 
 
 int
-rpcsvc_conn_check_volume_general (dict_t *options, rpcsvc_conn_t *conn)
+rpcsvc_transport_check_volume_general (dict_t *options, rpc_transport_t *trans)
 {
         int             addrchk = RPCSVC_AUTH_REJECT;
         int             namechk = RPCSVC_AUTH_REJECT;
@@ -410,7 +414,7 @@ rpcsvc_conn_check_volume_general (dict_t *options, rpcsvc_conn_t *conn)
         char            *namestr = NULL;
         int             ret = 0;
 
-        if ((!options) || (!conn))
+        if ((!options) || (!trans))
                 return RPCSVC_AUTH_REJECT;
 
         /* Enabled by default */
@@ -431,8 +435,10 @@ rpcsvc_conn_check_volume_general (dict_t *options, rpcsvc_conn_t *conn)
          * specific which will over-ride the network address rules.
          */
         if (namelookup)
-                namechk = rpcsvc_conn_peer_check_name (options, NULL, conn);
-        addrchk = rpcsvc_conn_peer_check_addr (options, NULL, conn);
+                namechk = rpcsvc_transport_peer_check_name (options, NULL, 
+                                                            trans);
+
+        addrchk = rpcsvc_transport_peer_check_addr (options, NULL, trans);
 
         if (namelookup)
                 ret = rpcsvc_combine_gen_spec_addr_checks (addrchk, namechk);
@@ -443,17 +449,18 @@ rpcsvc_conn_check_volume_general (dict_t *options, rpcsvc_conn_t *conn)
 }
 
 int
-rpcsvc_conn_peer_check (dict_t *options, char *volname, rpcsvc_conn_t *conn)
+rpcsvc_transport_peer_check (dict_t *options, char *volname,
+                             rpc_transport_t *trans)
 {
         int     general_chk = RPCSVC_AUTH_REJECT;
         int     specific_chk = RPCSVC_AUTH_REJECT;
 
-        if ((!options) || (!volname) || (!conn))
+        if ((!options) || (!volname) || (!trans))
                 return RPCSVC_AUTH_REJECT;
 
-        general_chk = rpcsvc_conn_check_volume_general (options, conn);
-        specific_chk = rpcsvc_conn_check_volume_specific (options, volname,
-                                                          conn);
+        general_chk = rpcsvc_transport_check_volume_general (options, trans);
+        specific_chk = rpcsvc_transport_check_volume_specific (options, volname,
+                                                               trans);
 
         return rpcsvc_combine_gen_spec_volume_checks (general_chk,specific_chk);
 }
@@ -494,68 +501,10 @@ out:
 }
 
 
-
-/* Initialize the core of a connection */
-rpcsvc_conn_t *
-rpcsvc_conn_alloc (rpcsvc_t *svc, rpc_transport_t *trans)
-{
-        rpcsvc_conn_t  *conn = NULL;
-        int             ret = -1;
-        unsigned int    poolcount = 0;
-
-        conn = GF_CALLOC (1, sizeof(*conn), gf_common_mt_rpcsvc_conn_t);
-        if (!conn) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "memory allocation failed");
-                return NULL;
-        }
-
-        conn->trans = trans;
-        conn->svc   = svc;
-        poolcount   = RPCSVC_POOLCOUNT_MULT * svc->memfactor;
-
-        gf_log (GF_RPCSVC, GF_LOG_TRACE, "rx pool: %d", poolcount);
-        conn->rxpool = mem_pool_new (rpcsvc_request_t, poolcount);
-        /* TODO: leak */
-        if (!conn->rxpool) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "mem pool allocation failed");
-                goto free_conn;
-        }
-
-        /* Cannot consider a connection connected unless the user of this
-         * connection decides it is ready to use. It is possible that we have
-         * to free this connection soon after. That free will not happpen
-         * unless the state is disconnected.
-         */
-        conn->connstate = RPCSVC_CONNSTATE_DISCONNECTED;
-        pthread_mutex_init (&conn->connlock, NULL);
-        conn->connref = 0;
-
-        ret = 0;
-
-free_conn:
-        if (ret == -1) {
-                GF_FREE (conn);
-                conn = NULL;
-        }
-
-        return conn;
-}
-
 int
 rpcsvc_notify (rpc_transport_t *trans, void *mydata,
                rpc_transport_event_t event, void *data, ...);
 
-void
-rpcsvc_conn_state_init (rpcsvc_conn_t *conn)
-{
-        if (!conn)
-                return;
-
-        ++conn->connref;
-        conn->connstate = RPCSVC_CONNSTATE_CONNECTED;
-}
-
-
 rpcsvc_notify_wrapper_t *
 rpcsvc_notify_wrapper_alloc (void)
 {
@@ -582,11 +531,7 @@ rpcsvc_listener_destroy (rpcsvc_listener_t *listener)
                 goto out;
         }
 
-        if (!listener->conn) {
-                goto listener_free;
-        }
-
-        svc = listener->conn->svc;
+        svc = listener->svc;
         if (!svc) {
                 goto listener_free;
         }
@@ -604,162 +549,11 @@ out:
 }
 
 
-void
-rpcsvc_conn_destroy (rpcsvc_conn_t *conn)
-{
-        rpcsvc_listener_t       *listener = NULL;
-
-        if (!conn || !conn->rxpool || !conn->listener)
-                goto out;
-
-        if (conn->trans)
-                rpc_transport_destroy (conn->trans);
-
-        mem_pool_destroy (conn->rxpool);
-
-        listener = conn->listener;
-        if (listener->conn == conn) {
-                rpcsvc_listener_destroy (listener);
-        }
-
-        /* Need to destory record state, txlists etc. */
-        GF_FREE (conn);
-out:
-        gf_log (GF_RPCSVC, GF_LOG_DEBUG, "Connection destroyed");
-}
-
-
-rpcsvc_conn_t *
-rpcsvc_conn_init (rpcsvc_t *svc, rpc_transport_t *trans)
-{
-        int            ret  = -1;
-        rpcsvc_conn_t *conn = NULL;
-
-        conn = rpcsvc_conn_alloc (svc, trans);
-        if (!conn) {
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "cannot init a connection");
-                goto out;
-        }
-
-        ret = rpc_transport_register_notify (trans, rpcsvc_notify, conn);
-        if (ret == -1) {
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "registering notify failed");
-                rpcsvc_conn_destroy (conn);
-                conn = NULL;
-                goto out;
-        }
-
-        rpcsvc_conn_state_init (conn);
-
-out:
-        return conn;
-}
-
-
-int
-__rpcsvc_conn_unref (rpcsvc_conn_t *conn)
-{
-        --conn->connref;
-        return conn->connref;
-}
-
-
-void
-__rpcsvc_conn_deinit (rpcsvc_conn_t *conn)
-{
-        if (!conn)
-                return;
-
-        if (rpcsvc_conn_check_active (conn)) {
-                conn->connstate = RPCSVC_CONNSTATE_DISCONNECTED;
-        }
-
-        if (conn->trans) {
-                rpc_transport_disconnect (conn->trans);
-                conn->trans = NULL;
-        }
-}
-
-
-void
-rpcsvc_conn_deinit (rpcsvc_conn_t *conn)
-{
-        int ref = 0;
-
-        if (!conn)
-                return;
-
-        pthread_mutex_lock (&conn->connlock);
-        {
-                __rpcsvc_conn_deinit (conn);
-                ref = __rpcsvc_conn_unref (conn);
-        }
-        pthread_mutex_unlock (&conn->connlock);
-
-        if (ref == 0)
-                rpcsvc_conn_destroy (conn);
-
-        return;
-}
-
-
-void
-rpcsvc_conn_unref (rpcsvc_conn_t *conn)
-{
-        int ref = 0;
-        if (!conn)
-                return;
-
-        pthread_mutex_lock (&conn->connlock);
-        {
-                ref = __rpcsvc_conn_unref (conn);
-        }
-        pthread_mutex_unlock (&conn->connlock);
-
-        if (ref == 0) {
-                rpcsvc_conn_destroy (conn);
-        }
-}
-
-
 int
-rpcsvc_conn_active (rpcsvc_conn_t *conn)
+rpcsvc_conn_privport_check (rpcsvc_t *svc, char *volname,
+                            rpc_transport_t *trans)
 {
-        int     status = 0;
-
-        if (!conn)
-                return 0;
-
-        pthread_mutex_lock (&conn->connlock);
-        {
-                status = rpcsvc_conn_check_active (conn);
-        }
-        pthread_mutex_unlock (&conn->connlock);
-
-        return status;
-}
-
-
-void
-rpcsvc_conn_ref (rpcsvc_conn_t *conn)
-{
-        if (!conn)
-                return;
-
-        pthread_mutex_lock (&conn->connlock);
-        {
-                ++conn->connref;
-        }
-        pthread_mutex_unlock (&conn->connlock);
-
-        return;
-}
-
-
-int
-rpcsvc_conn_privport_check (rpcsvc_t *svc, char *volname, rpcsvc_conn_t *conn)
-{
-        struct sockaddr_in      sa;
+        struct sockaddr_storage sa  = {0, };
         int                     ret = RPCSVC_AUTH_REJECT;
         socklen_t               sasize = sizeof (sa);
         char                    *srchstr = NULL;
@@ -769,11 +563,11 @@ rpcsvc_conn_privport_check (rpcsvc_t *svc, char *volname, rpcsvc_conn_t *conn)
         ui