[Asterisk-code-review] chan_sip: Remove unused sip_socket->port. (asterisk[master])

[Kevin Harwell]

Kevin Harwell has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/15137 )

Change subject: chan_sip: Remove unused sip_socket->port.
......................................................................

chan_sip: Remove unused sip_socket->port.

12 years ago, with ASTERISK_12115 the last four get/uses of socket.port
vanished. However, the struct member itself and all seven set/uses
remained as dead code.

ASTERISK-28798

Change-Id: Ib90516a49eca3d724a70191278aaf2144fb58c59
---
M channels/chan_sip.c
M channels/sip/include/sip.h
2 files changed, 4 insertions(+), 24 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved; Approved for Submit
  Sean Bright: Looks good to me, but someone else must approve



diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index dc14661..ad4f968 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3121,10 +3121,8 @@
 
 			if (ast_iostream_get_ssl(tcptls_session->stream)) {
 				set_socket_transport(&req.socket, AST_TRANSPORT_TLS);
-				req.socket.port = htons(ourport_tls);
 			} else {
 				set_socket_transport(&req.socket, AST_TRANSPORT_TCP);
-				req.socket.port = htons(ourport_tcp);
 			}
 			req.socket.fd = ast_iostream_get_fd(tcptls_session->stream);
 
@@ -6403,10 +6401,8 @@
 		}
 	}
 
-	if (!dialog->socket.type)
+	if (!dialog->socket.type) {
 		set_socket_transport(&dialog->socket, AST_TRANSPORT_UDP);
-	if (!dialog->socket.port) {
-		dialog->socket.port = htons(ast_sockaddr_port(&bindaddr));
 	}
 
 	if (!ast_sockaddr_port(&dialog->sa)) {
@@ -15149,7 +15145,6 @@
 		ast_string_field_set(mwi->call, peersecret, mwi->secret);
 	}
 	set_socket_transport(&mwi->call->socket, mwi->transport);
-	mwi->call->socket.port = htons(mwi->portno);
 	ast_sip_ouraddrfor(&mwi->call->sa, &mwi->call->ourip, mwi->call);
 	build_via(mwi->call);
 
@@ -16263,19 +16258,8 @@
 			ast_string_field_set(p, exten, r->callback);
 		}
 
-		/* Set transport and port so the correct contact is built */
+		/* Set transport so the correct contact is built */
 		set_socket_transport(&p->socket, r->transport);
-		if (r->transport == AST_TRANSPORT_TLS || r->transport == AST_TRANSPORT_TCP) {
-			if (ast_sockaddr_isnull(&sip_tcp_desc.local_address)) {
-				ast_log(LOG_ERROR,
-				    "TCP/TLS clients without server were not tested.\n");
-				ast_log(LOG_ERROR,
-				    "Please, follow-up and report at issue 28798.\n");
-			} else {
-				p->socket.port =
-				    htons(ast_sockaddr_port(&sip_tcp_desc.local_address));
-			}
-		}
 
 		/*
 		  check which address we should use in our contact header
@@ -29423,8 +29407,7 @@
 
 	req.socket.fd = sipsock;
 	set_socket_transport(&req.socket, AST_TRANSPORT_UDP);
-	req.socket.tcptls_session	= NULL;
-	req.socket.port = htons(ast_sockaddr_port(&bindaddr));
+	req.socket.tcptls_session = NULL;
 
 	handle_request_do(&req, &addr);
 	deinit_req(&req);
@@ -32365,9 +32348,6 @@
 				      (peer->socket.type & AST_TRANSPORT_TLS) ?
 				      STANDARD_TLS_PORT : STANDARD_SIP_PORT);
 	}
-	if (!peer->socket.port) {
-		peer->socket.port = htons(((peer->socket.type & AST_TRANSPORT_TLS) ? STANDARD_TLS_PORT : STANDARD_SIP_PORT));
-	}
 
 	if (realtime) {
 		int enablepoke = 1;
diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h
index ca26fa3..18db352 100644
--- a/channels/sip/include/sip.h
+++ b/channels/sip/include/sip.h
@@ -790,7 +790,7 @@
 struct sip_socket {
 	enum ast_transport type;  /*!< UDP, TCP or TLS */
 	int fd;                   /*!< Filed descriptor, the actual socket */
-	uint16_t port;
+	uint16_t unused; /* since 1.6.2, retained not to change order/size of struct */
 	struct ast_tcptls_session_instance *tcptls_session;  /* If tcp or tls, a socket manager */
 	struct ast_websocket *ws_session; /*! If ws or wss, a WebSocket session */
 };

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/15137
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: Ib90516a49eca3d724a70191278aaf2144fb58c59
Gerrit-Change-Number: 15137
Gerrit-PatchSet: 3
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20201119/436db0bf/attachment.html>