Remove the unused __open_inet_server()

Author: jfsmig

main/cnx.c

@@ -40,43 +40,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 static volatile int backlog_unix = 65536;
 static volatile int backlog_tcp = 4096;
 
-static int
-__addr_split(gchar *url_wrk, gchar ** host, gchar ** port)
-{
-	int len;
-	gchar *last_semicolon;
-
-	len = strlen(url_wrk);
-
-	if (*url_wrk == '[') {	/*[IP]:PORT */
-
-		last_semicolon = g_strrstr(url_wrk, ":");
-		if (!last_semicolon || last_semicolon - url_wrk >= len)
-			return 0;
-
-		*(last_semicolon - 1) = '\0';
-		*port = &(last_semicolon[1]);
-		*host = &(url_wrk[1]);
-		return 1;
-	}
-
-	last_semicolon = g_strrstr(url_wrk, ":");
-	if (!last_semicolon || last_semicolon - url_wrk >= len)
-		return 0;
-
-	*last_semicolon = '\0';
-	*port = &(last_semicolon[1]);
-	*host = &(url_wrk[0]);
-	return 1;
-}
-
 int
 __open_unix_client(const char *path)
 {
 	int sock;
-	struct sockaddr_un local;
+	struct sockaddr_un local = {};
 
-	memset(&local, 0x00, sizeof(local));
 	if (!path || strlen(path) >= sizeof(local.sun_path)) {
 		errno = EINVAL;
 		return -1;
@@ -116,10 +85,8 @@ __open_unix_client(const char *path)
 int
 __open_unix_server(const char *path)
 {
-	int sock;
-	struct sockaddr_un local;
+	struct sockaddr_un local = {};
 
-	memset(&local, 0x00, sizeof(local));
 	if (!path || strlen(path) >= sizeof(local.sun_path)) {
 		errno = EINVAL;
 		return -1;
@@ -132,7 +99,7 @@ __open_unix_server(const char *path)
 # define SOCK_FLAGS 0
 #endif
 
-	sock = socket(PF_UNIX, SOCK_STREAM | SOCK_FLAGS, 0);
+	int sock = socket(PF_UNIX, SOCK_STREAM | SOCK_FLAGS, 0);
 	if (sock < 0)
 		return -1;
 
@@ -166,59 +133,3 @@ __open_unix_server(const char *path)
 	return -1;
 }
 
-int
-__open_inet_server(const char *url)
-{
-	gchar url_wrk[512];
-	
-	int sock = -1;
-	int i_opt = 1;
-	struct sockaddr_in sin;
-	gchar *host=NULL, *port=NULL;
-
-	memset(url_wrk, 0x00, sizeof(url_wrk));
-	g_strlcpy(url_wrk, url, sizeof(url_wrk)-1);
-
-	if (!__addr_split(url_wrk, &host, &port)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	sock = socket(PF_INET, SOCK_STREAM, 0);
-	if (sock < 0) {
-		/* transmit the errno as is */
-		return -1;
-	}
-
-	/* SO_REUSEADDR */
-	i_opt = 1;
-	if (0 != setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, (void*) &i_opt, sizeof(i_opt)))
-		WARN("Cannot set SO_REUSEADDR flag on socket %d (%s)", sock, strerror(errno));
-
-	/* bind on the given URL then wait for incoming connections */
-	memset(&sin, 0x00, sizeof(sin));
-	sin.sin_family = AF_INET;
-	sin.sin_port = htons(atoi(port));
-	if (!inet_aton(host, &(sin.sin_addr)))
-		goto label_error;
-
-	if (-1 == bind(sock, (struct sockaddr *)&sin, sizeof(sin)))
-		goto label_error;
-
-	if (-1 == listen(sock, backlog_tcp))
-		goto label_error;
-
-	errno = 0;
-	return sock;
-
-label_error:
-	if (sock >= 0) {
-		typeof(errno) errsav;
-		errsav = errno;
-		close(sock);
-		errno = errsav;
-	}
-	return -1;
-}
-
-

main/gridinit_internals.h

@@ -84,8 +84,6 @@ int __open_unix_server(const char *path);
 
 int __open_unix_client(const char *path);
 
-int __open_inet_server(const char *url);
-
 /* Groups matching */
 
 gboolean gridinit_group_in_set(const gchar *group, const gchar *set);