From aa69140dba30c422fd3824868ed7953b2c5a96b7 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 30 Jun 2020 10:17:44 +0900 Subject: [PATCH] lib/iscsi: Remove unused the param conn from iscsi_append_text() Previously we might have any possibility to need conn in iscsi_append_text(), but it is highly unlikely now. Let's remove the param conn from iscsi_append_text(). This patch includes a minor simplification not to use rc but return directly. Signed-off-by: Shuhei Matsumoto Change-Id: Ifa009c1374e878f8d3b9c0043ba0352f59010b59 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3157 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Paul Luse Reviewed-by: Jim Harris --- lib/iscsi/iscsi.c | 34 ++++++++-------------- test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c | 42 +++++++++++++-------------- 2 files changed, 33 insertions(+), 43 deletions(-) diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c index 974f97ef9..8487755f2 100644 --- a/lib/iscsi/iscsi.c +++ b/lib/iscsi/iscsi.c @@ -757,8 +757,7 @@ append_iscsi_sess(struct spdk_iscsi_conn *conn, } static int -iscsi_append_text(struct spdk_iscsi_conn *conn __attribute__((__unused__)), - const char *key, const char *val, uint8_t *data, +iscsi_append_text(const char *key, const char *val, uint8_t *data, int alloc_len, int data_len) { int total; @@ -789,7 +788,6 @@ iscsi_append_param(struct spdk_iscsi_conn *conn, const char *key, uint8_t *data, int alloc_len, int data_len) { struct iscsi_param *param; - int rc; param = iscsi_param_find(conn->params, key); if (param == NULL) { @@ -799,9 +797,8 @@ iscsi_append_param(struct spdk_iscsi_conn *conn, const char *key, return data_len; } } - rc = iscsi_append_text(conn, param->key, param->val, data, - alloc_len, data_len); - return rc; + return iscsi_append_text(param->key, param->val, data, + alloc_len, data_len); } static int @@ -866,21 +863,18 @@ iscsi_auth_params(struct spdk_iscsi_conn *conn, if (new_val == NULL) { snprintf(in_val, ISCSI_TEXT_MAX_VAL_LEN + 1, "%s", "Reject"); new_val = in_val; - iscsi_append_text(conn, "CHAP_A", new_val, - data, alloc_len, total); + iscsi_append_text("CHAP_A", new_val, data, alloc_len, total); goto error_return; } /* selected algorithm is 5 (MD5) */ SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "got CHAP_A=%s\n", new_val); - total = iscsi_append_text(conn, "CHAP_A", new_val, - data, alloc_len, total); + total = iscsi_append_text("CHAP_A", new_val, data, alloc_len, total); /* Identifier is one octet */ gen_random(conn->auth.chap_id, 1); snprintf(in_val, ISCSI_TEXT_MAX_VAL_LEN, "%d", (int) conn->auth.chap_id[0]); - total = iscsi_append_text(conn, "CHAP_I", in_val, - data, alloc_len, total); + total = iscsi_append_text("CHAP_I", in_val, data, alloc_len, total); /* Challenge Value is a variable stream of octets */ /* (binary length MUST not exceed 1024 bytes) */ @@ -888,8 +882,7 @@ iscsi_auth_params(struct spdk_iscsi_conn *conn, gen_random(conn->auth.chap_challenge, conn->auth.chap_challenge_len); bin2hex(in_val, ISCSI_TEXT_MAX_VAL_LEN, conn->auth.chap_challenge, conn->auth.chap_challenge_len); - total = iscsi_append_text(conn, "CHAP_C", in_val, - data, alloc_len, total); + total = iscsi_append_text("CHAP_C", in_val, data, alloc_len, total); conn->auth.chap_phase = ISCSI_CHAP_PHASE_WAIT_NR; } else if ((name = iscsi_param_get_val(params, "CHAP_N")) != NULL) { @@ -1031,10 +1024,9 @@ iscsi_auth_params(struct spdk_iscsi_conn *conn, bin2hex(in_val, ISCSI_TEXT_MAX_VAL_LEN, tgtmd5, SPDK_MD5DIGEST_LEN); - total = iscsi_append_text(conn, "CHAP_N", - conn->auth.muser, data, alloc_len, total); - total = iscsi_append_text(conn, "CHAP_R", - in_val, data, alloc_len, total); + total = iscsi_append_text("CHAP_N", conn->auth.muser, data, + alloc_len, total); + total = iscsi_append_text("CHAP_R", in_val, data, alloc_len, total); } else { /* not mutual */ if (conn->mutual_chap) { @@ -2395,10 +2387,8 @@ iscsi_pdu_payload_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *p if (strcasecmp(val, "ALL") == 0) { /* not in discovery session */ - data_len = iscsi_append_text(conn, - "SendTargets", - "Reject", data, - alloc_len, data_len); + data_len = iscsi_append_text("SendTargets", "Reject", + data, alloc_len, data_len); } else { data_len = iscsi_send_tgts(conn, conn->initiator_name, diff --git a/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c b/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c index 359b95981..f222acb48 100644 --- a/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c +++ b/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c @@ -597,54 +597,54 @@ fuzz_iscsi_send_login_request(struct fuzz_iscsi_dev_ctx *dev_ctx, uint8_t sessio req_pdu->bhs.flags = ISCSI_LOGIN_TRANSIT | (ISCSI_OPERATIONAL_NEGOTIATION_PHASE << 2) | ISCSI_FULL_FEATURE_PHASE; - req_pdu->data_segment_len = iscsi_append_text(conn, "InitiatorName", g_init_name, + req_pdu->data_segment_len = iscsi_append_text("InitiatorName", g_init_name, req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "HeaderDigest", "None", + req_pdu->data_segment_len = iscsi_append_text("HeaderDigest", "None", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "DataDigest", "None", + req_pdu->data_segment_len = iscsi_append_text("DataDigest", "None", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "DefaultTime2Wait", "2", + req_pdu->data_segment_len = iscsi_append_text("DefaultTime2Wait", "2", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "DefaultTime2Retain", "0", + req_pdu->data_segment_len = iscsi_append_text("DefaultTime2Retain", "0", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "IFMarker", "No", + req_pdu->data_segment_len = iscsi_append_text("IFMarker", "No", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "OFMarker", "No", + req_pdu->data_segment_len = iscsi_append_text("OFMarker", "No", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "ErrorRecoveryLevel", "0", + req_pdu->data_segment_len = iscsi_append_text("ErrorRecoveryLevel", "0", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); if (session_type == SESSION_TYPE_DISCOVERY) { /* Discovery PDU */ conn->sess->session_type = SESSION_TYPE_DISCOVERY; - req_pdu->data_segment_len = iscsi_append_text(conn, "SessionType", "Discovery", + req_pdu->data_segment_len = iscsi_append_text("SessionType", "Discovery", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "MaxRecvDataSegmentLength", "32768", + req_pdu->data_segment_len = iscsi_append_text("MaxRecvDataSegmentLength", "32768", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); } else { /* Login PDU */ conn->sess->session_type = SESSION_TYPE_NORMAL; - req_pdu->data_segment_len = iscsi_append_text(conn, "SessionType", "Normal", + req_pdu->data_segment_len = iscsi_append_text("SessionType", "Normal", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "TargetName", g_tgt_name, + req_pdu->data_segment_len = iscsi_append_text("TargetName", g_tgt_name, req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "InitialR2T", "No", + req_pdu->data_segment_len = iscsi_append_text("InitialR2T", "No", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "ImmediateData", "Yes", + req_pdu->data_segment_len = iscsi_append_text("ImmediateData", "Yes", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "MaxBurstLength", "16776192", + req_pdu->data_segment_len = iscsi_append_text("MaxBurstLength", "16776192", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "FirstBurstLength", "262144", + req_pdu->data_segment_len = iscsi_append_text("FirstBurstLength", "262144", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "MaxOutstandingR2T", "1", + req_pdu->data_segment_len = iscsi_append_text("MaxOutstandingR2T", "1", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "MaxConnections", "1", + req_pdu->data_segment_len = iscsi_append_text("MaxConnections", "1", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "DataPDUInOrder", "Yes", + req_pdu->data_segment_len = iscsi_append_text("DataPDUInOrder", "Yes", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "DataSequenceInOrder", "Yes", + req_pdu->data_segment_len = iscsi_append_text("DataSequenceInOrder", "Yes", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); - req_pdu->data_segment_len = iscsi_append_text(conn, "MaxRecvDataSegmentLength", "262144", + req_pdu->data_segment_len = iscsi_append_text("MaxRecvDataSegmentLength", "262144", req_pdu->data, req_pdu->data_buf_len, req_pdu->data_segment_len); }