dcerpc: update the argument names for dcerpc_call_async

to be more descriptive. Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
sahlberg · Dec 28, 2024 · 076ed4c · 076ed4c
1 parent ee47fcc
commit 076ed4c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/include/smb2/libsmb2-dcerpc.h b/include/smb2/libsmb2-dcerpc.h
@@ -101,9 +101,10 @@ struct smb2_context *dcerpc_get_smb2_context(struct dcerpc_context *dce);
 void *dcerpc_get_pdu_payload(struct dcerpc_pdu *pdu);
 
 int dcerpc_open_async(struct dcerpc_context *dce, dcerpc_cb cb, void *cb_data);
-int dcerpc_call_async(struct dcerpc_context *dce, int opnum,
+int dcerpc_call_async(struct dcerpc_context *dce,
+                      int opnum,
                       dcerpc_coder req_coder, void *req,
-                      dcerpc_coder rep_coder, int rep_size,
+                      dcerpc_coder rep_coder, int decode_size,
                       dcerpc_cb cb, void *cb_data);
 
 int dcerpc_do_coder(struct dcerpc_context *ctx, struct dcerpc_pdu *pdu,

diff --git a/lib/dcerpc.c b/lib/dcerpc.c
@@ -1568,17 +1568,17 @@ dcerpc_call_cb(struct smb2_context *smb2, int status,
 int
 dcerpc_call_async(struct dcerpc_context *dce,
                   int opnum,
-                  dcerpc_coder encoder, void *ptr,
-                  dcerpc_coder decoder, int decode_size,
+                  dcerpc_coder req_coder, void *req,
+                  dcerpc_coder rep_coder, int decode_size,
                   dcerpc_cb cb, void *cb_data)
 {
         struct dcerpc_pdu *pdu;
         struct smb2_pdu *smb2_pdu;
-        struct smb2_ioctl_request req;
+        struct smb2_ioctl_request smb2_req;
         struct smb2_iovec iov _U_;
         int offset = 0, o;
         uint32_t v;
-        
+
         pdu = dcerpc_allocate_pdu(dce, DCERPC_ENCODE, NSE_BUF_SIZE);
         if (pdu == NULL) {
                 return -ENOMEM;
@@ -1595,7 +1595,7 @@ dcerpc_call_async(struct dcerpc_context *dce,
         pdu->req.context_id = dce->tctx_id;
         pdu->req.opnum = opnum;
 
-        pdu->coder = decoder;
+        pdu->coder = rep_coder;
         pdu->decode_size = decode_size;
         pdu->cb = cb;
         pdu->cb_data = cb_data;
@@ -1610,7 +1610,7 @@ dcerpc_call_async(struct dcerpc_context *dce,
 
         /* encode the blob */
         pdu->top_level = 1;
-        if (encoder(dce, pdu, &iov, &offset, ptr)) {
+        if (req_coder(dce, pdu, &iov, &offset, req)) {
                 return -1;
         }
 
@@ -1627,14 +1627,14 @@ dcerpc_call_async(struct dcerpc_context *dce,
                 return -1;
         }
 
-        memset(&req, 0, sizeof(struct smb2_ioctl_request));
-        req.ctl_code = SMB2_FSCTL_PIPE_TRANSCEIVE;
-        memcpy(req.file_id, dce->file_id, SMB2_FD_SIZE);
-        req.input_count = (uint32_t)iov.len;
-        req.input = iov.buf;
-        req.flags = SMB2_0_IOCTL_IS_FSCTL;
+        memset(&smb2_req, 0, sizeof(struct smb2_ioctl_request));
+        smb2_req.ctl_code = SMB2_FSCTL_PIPE_TRANSCEIVE;
+        memcpy(smb2_req.file_id, dce->file_id, SMB2_FD_SIZE);
+        smb2_req.input_count = (uint32_t)iov.len;
+        smb2_req.input = iov.buf;
+        smb2_req.flags = SMB2_0_IOCTL_IS_FSCTL;
 
-        smb2_pdu = smb2_cmd_ioctl_async(dce->smb2, &req, dcerpc_call_cb, pdu);
+        smb2_pdu = smb2_cmd_ioctl_async(dce->smb2, &smb2_req, dcerpc_call_cb, pdu);
         if (smb2_pdu == NULL) {
                 dcerpc_free_pdu(dce, pdu);
                 return -ENOMEM;