rpc: move handling of fragment headers to socket.

- fragment headers are only specific to tcp and hence should be handled in
    transport-socket instead of by rpc layer.

Signed-off-by: Raghavendra G <raghavendra@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875

2 files changed, 5 insertions, 71 deletions

diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index 2bbbb43c4..c75d41247 100644
--- a/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
@@ -1032,42 +1032,16 @@ out:
 }
 
 
-void
-rpc_clnt_set_lastfrag (uint32_t *fragsize) {
-        (*fragsize) |= 0x80000000U;
-}
-
-
-void
-rpc_clnt_set_frag_header_size (uint32_t size, char *haddr)
-{
-        size = htonl (size);
-        memcpy (haddr, &size, sizeof (size));
-}
-
-
-void
-rpc_clnt_set_last_frag_header_size (uint32_t size, char *haddr)
-{
-        rpc_clnt_set_lastfrag (&size);
-        rpc_clnt_set_frag_header_size (size, haddr);
-}
-
-
 struct iovec
 rpc_clnt_record_build_header (char *recordstart, size_t rlen,
                               struct rpc_msg *request, size_t payload)
 {
         struct iovec    requesthdr = {0, };
         struct iovec    txrecord   = {0, 0};
-        size_t          fraglen    = 0;
         int             ret        = -1;
+        size_t          fraglen    = 0;
 
-        /* After leaving aside the 4 bytes for the fragment header, lets
-         * encode the RPC reply structure into the buffer given to us.
-         */
-        ret = rpc_request_to_xdr (request, (recordstart + RPC_FRAGHDR_SIZE),
-                                  rlen, &requesthdr);
+        ret = rpc_request_to_xdr (request, recordstart, rlen, &requesthdr);
         if (ret == -1) {
                 gf_log ("rpc-clnt", GF_LOG_DEBUG,
                         "Failed to create RPC request");
@@ -1078,16 +1052,7 @@ rpc_clnt_record_build_header (char *recordstart, size_t rlen,
         gf_log ("rpc-clnt", GF_LOG_TRACE, "Request fraglen %zu, payload: %zu, "
                 "rpc hdr: %zu", fraglen, payload, requesthdr.iov_len);
 
-        /* Since we're not spreading RPC records over mutiple fragments
-         * we just set this fragment as the first and last fragment for this
-         * record.
-         */
-        rpc_clnt_set_last_frag_header_size (fraglen, recordstart);
 
-        /* Even though the RPC record starts at recordstart+RPCSVC_FRAGHDR_SIZE
-         * we need to transmit the record with the fragment header, which starts
-         * at recordstart.
-         */
         txrecord.iov_base = recordstart;
 
         /* Remember, this is only the vec for the RPC header and does not
@@ -1095,7 +1060,7 @@ rpc_clnt_record_build_header (char *recordstart, size_t rlen,
          * the size of the full fragment. This size is sent in the fragment
          * header.
          */
-        txrecord.iov_len = RPC_FRAGHDR_SIZE + requesthdr.iov_len;
+        txrecord.iov_len = requesthdr.iov_len;
 
 out:
         return txrecord;
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index 687deefba..aed8e4f13 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -1236,26 +1236,6 @@ out:
 }
 
 
-void
-rpcsvc_set_lastfrag (uint32_t *fragsize) {
-        (*fragsize) |= 0x80000000U;
-}
-
-void
-rpcsvc_set_frag_header_size (uint32_t size, char *haddr)
-{
-        size = htonl (size);
-        memcpy (haddr, &size, sizeof (size));
-}
-
-void
-rpcsvc_set_last_frag_header_size (uint32_t size, char *haddr)
-{
-        rpcsvc_set_lastfrag (&size);
-        rpcsvc_set_frag_header_size (size, haddr);
-}
-
-
 /* Given the RPC reply structure and the payload handed by the RPC program,
  * encode the RPC record header into the buffer pointed by recordstart.
  */
@@ -1271,8 +1251,7 @@ rpcsvc_record_build_header (char *recordstart, size_t rlen,
         /* After leaving aside the 4 bytes for the fragment header, lets
          * encode the RPC reply structure into the buffer given to us.
          */
-        ret = rpc_reply_to_xdr (&reply,(recordstart + RPCSVC_FRAGHDR_SIZE),
-                                rlen, &replyhdr);
+        ret = rpc_reply_to_xdr (&reply, recordstart, rlen, &replyhdr);
         if (ret == -1) {
                 gf_log (GF_RPCSVC, GF_LOG_ERROR, "Failed to create RPC reply");
                 goto err;
@@ -1282,16 +1261,6 @@ rpcsvc_record_build_header (char *recordstart, size_t rlen,
         gf_log (GF_RPCSVC, GF_LOG_TRACE, "Reply fraglen %zu, payload: %zu, "
                 "rpc hdr: %zu", fraglen, payload, replyhdr.iov_len);
 
-        /* Since we're not spreading RPC records over mutiple fragments
-         * we just set this fragment as the first and last fragment for this
-         * record.
-         */
-        rpcsvc_set_last_frag_header_size (fraglen, recordstart);
-
-        /* Even though the RPC record starts at recordstart+RPCSVC_FRAGHDR_SIZE
-         * we need to transmit the record with the fragment header, which starts
-         * at recordstart.
-         */
         txrecord.iov_base = recordstart;
 
         /* Remember, this is only the vec for the RPC header and does not
@@ -1299,7 +1268,7 @@ rpcsvc_record_build_header (char *recordstart, size_t rlen,
          * the size of the full fragment. This size is sent in the fragment
          * header.
          */
-        txrecord.iov_len = RPCSVC_FRAGHDR_SIZE + replyhdr.iov_len;
+        txrecord.iov_len = replyhdr.iov_len;
 err:
         return txrecord;
 }