diff rvinterf/libasync/init.c @ 422:c1aadfcd185f

rvinterf client refactoring: libasync clients converted to use libinterf
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 28 Oct 2018 00:00:51 +0000
parents 09b4fd9b3827
children
line wrap: on
line diff
--- a/rvinterf/libasync/init.c	Sat Oct 27 23:48:20 2018 +0000
+++ b/rvinterf/libasync/init.c	Sun Oct 28 00:00:51 2018 +0000
@@ -1,60 +1,15 @@
 /*
- * This module contains the common initialization code for fc-shell and fc-tmsh.
+ * This module contains some common initialization code
+ * for fc-shell and fc-tmsh.
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
 #include <stdio.h>
-#include <string.h>
-#include <strings.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "pktmux.h"
-#include "localsock.h"
-#include "exitcodes.h"
 
-extern char *socket_pathname;
 extern int sock;
 
-connect_local_socket()
-{
-	/* local socket binding voodoo copied from osmocon */
-	struct sockaddr_un local;
-	unsigned int namelen;
-	int rc;
-
-	sock = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (sock < 0) {
-		perror("socket(AF_UNIX, SOCK_STREAM, 0)");
-		exit(ERROR_UNIX);
-	}
-
-	local.sun_family = AF_UNIX;
-	strncpy(local.sun_path, socket_pathname, sizeof(local.sun_path));
-	local.sun_path[sizeof(local.sun_path) - 1] = '\0';
-
-	/* we use the same magic that X11 uses in Xtranssock.c for
-	 * calculating the proper length of the sockaddr */
-#if defined(BSD44SOCKETS) || defined(__UNIXWARE__)
-	local.sun_len = strlen(local.sun_path);
-#endif
-#if defined(BSD44SOCKETS) || defined(SUN_LEN)
-	namelen = SUN_LEN(&local);
-#else
-	namelen = strlen(local.sun_path) +
-		  offsetof(struct sockaddr_un, sun_path) + 1;
-#endif
-
-	rc = connect(sock, (struct sockaddr *) &local, namelen);
-	if (rc != 0) {
-		perror(socket_pathname);
-		exit(ERROR_RVINTERF);
-	}
-
-	return(0);
-}
-
 send_init_command(cmdpkt, cmdlen)
 	u_char *cmdpkt;
 {