/*
- * ipc_c_tcp.c
+ * $Id$
*
- * Citadel/UX client/server IPC - client module using TCP/IP
- *
- * version 1.3 $Id$
+ * Client-side IPC functions
*
*/
-#define DEFAULT_HOST "127.0.0.1"
-#define DEFAULT_PORT "citadel"
+#define UDS "_UDS_"
+
+#define DEFAULT_HOST UDS
+#define DEFAULT_PORT "citadel"
#include "sysdep.h"
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <sys/un.h>
#include <netdb.h>
#include <string.h>
#include <pwd.h>
#include "citadel.h"
#include "citadel_decls.h"
#include "ipc.h"
+#include "tools.h"
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
* network session to the local machine) or 0 if the server is executing on
* a remote computer.
*/
-char server_is_local = 0;
+int server_is_local = 0;
#ifndef INADDR_NONE
#define INADDR_NONE 0xffffffff
int serv_sock;
+void connection_died(void) {
+ fprintf(stderr, "\r"
+ "Your connection to this Citadel server is broken.\n"
+ "Please re-connect and log in again.\n");
+ logoff(3);
+}
+
+
void timeout(int signum)
{
printf("\rConnection timed out.\n");
logoff(3);
}
-int connectsock(char *host, char *service, char *protocol)
+
+static int connectsock(char *host, char *service, char *protocol, int defaultPort)
{
struct hostent *phe;
struct servent *pse;
sin.sin_family = AF_INET;
pse = getservbyname(service, protocol);
- if (pse) {
+ if (pse != NULL) {
sin.sin_port = pse->s_port;
- } else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
- fprintf(stderr, "Can't get %s service entry: %s\n",
- service, strerror(errno));
- logoff(3);
+ }
+ else if (atoi(service) > 0) {
+ sin.sin_port = htons(atoi(service));
+ }
+ else {
+ sin.sin_port = htons(defaultPort);
}
phe = gethostbyname(host);
if (phe) {
return (s);
}
-/*
- * convert service and host entries into a six-byte numeric in the format
- * expected by a SOCKS v4 server
- */
-void numericize(char *buf, char *host, char *service, char *protocol)
+int uds_connectsock(char *sockpath)
{
- struct hostent *phe;
- struct servent *pse;
- struct sockaddr_in sin;
+ struct sockaddr_un addr;
+ int s;
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
+ memset(&addr, 0, sizeof(addr));
+ addr.sun_family = AF_UNIX;
+ safestrncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
- pse = getservbyname(service, protocol);
- if (pse) {
- sin.sin_port = pse->s_port;
- } else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
- fprintf(stderr, "Can't get %s service entry: %s\n",
- service, strerror(errno));
+ s = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (s < 0) {
+ fprintf(stderr, "Can't create socket: %s\n",
+ strerror(errno));
logoff(3);
}
- buf[1] = (((sin.sin_port) & 0xFF00) >> 8);
- buf[0] = ((sin.sin_port) & 0x00FF);
- phe = gethostbyname(host);
- if (phe) {
- memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
- } else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
- fprintf(stderr, "Can't get %s host entry: %s\n",
- host, strerror(errno));
+ if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+ fprintf(stderr, "can't connect: %s\n",
+ strerror(errno));
logoff(3);
}
- buf[5] = ((sin.sin_addr.s_addr) & 0xFF000000) >> 24;
- buf[4] = ((sin.sin_addr.s_addr) & 0x00FF0000) >> 16;
- buf[3] = ((sin.sin_addr.s_addr) & 0x0000FF00) >> 8;
- buf[2] = ((sin.sin_addr.s_addr) & 0x000000FF);
+
+ server_is_local = 1;
+ return s;
}
+
/*
* input binary data from socket
*/
while (len < bytes) {
rlen = read(serv_sock, &buf[len], bytes - len);
if (rlen < 1) {
- /* printf("\rNetwork error - connection terminated.\n");
- printf("%s\n", strerror(errno)); */
- logoff(3);
+ connection_died();
+ return;
}
len = len + rlen;
}
retval = write(serv_sock, &buf[bytes_written],
nbytes - bytes_written);
if (retval < 1) {
- /*
- printf("\rNetwork error - connection terminated.\n");
- printf("%s\n", strerror(errno)); */
- logoff(3);
+ connection_died();
+ return;
}
bytes_written = bytes_written + retval;
}
*/
for (i = 0;; i++) {
serv_read(&buf[i], 1);
- if (buf[i] == '\n' || i == 255)
+ if (buf[i] == '\n' || i == (SIZ-1))
break;
}
/* If we got a long line, discard characters until the newline.
*/
- if (i == 255)
+ if (i == (SIZ-1))
while (buf[i] != '\n')
serv_read(&buf[i], 1);
/*
* attach to server
*/
-void attach_to_server(int argc, char **argv)
+void attach_to_server(int argc, char **argv, char *hostbuf, char *portbuf)
{
int a;
- char cithost[256];
- int host_copied = 0;
- char citport[256];
- int port_copied = 0;
- char socks4[256];
- char buf[256];
- struct passwd *p;
+ char cithost[SIZ];
+ char citport[SIZ];
+ char sockpath[SIZ];
strcpy(cithost, DEFAULT_HOST); /* default host */
strcpy(citport, DEFAULT_PORT); /* default port */
- strcpy(socks4, ""); /* SOCKS v4 server */
for (a = 0; a < argc; ++a) {
if (a == 0) {
/* do nothing */
- } else if (!strcmp(argv[a], "-s")) {
- strcpy(socks4, argv[++a]);
- } else if (host_copied == 0) {
- host_copied = 1;
+ } else if (a == 1) {
strcpy(cithost, argv[a]);
- } else if (port_copied == 0) {
- port_copied = 1;
+ } else if (a == 2) {
strcpy(citport, argv[a]);
}
-/*
- else {
- fprintf(stderr,"%s: usage: ",argv[0]);
- fprintf(stderr,"%s [host] [port] ",argv[0]);
- fprintf(stderr,"[-s socks_server]\n");
- logoff(2);
- }
- */
+ else {
+ fprintf(stderr,"%s: usage: ",argv[0]);
+ fprintf(stderr,"%s [host] [port] ",argv[0]);
+ logoff(2);
+ }
}
- server_is_local = 0;
if ((!strcmp(cithost, "localhost"))
- || (!strcmp(cithost, "127.0.0.1")))
+ || (!strcmp(cithost, "127.0.0.1"))) {
server_is_local = 1;
+ }
- /* if not using a SOCKS proxy server, make the connection directly */
- if (strlen(socks4) == 0) {
- serv_sock = connectsock(cithost, citport, "tcp");
+ /* If we're using a unix domain socket we can do a bunch of stuff */
+ if (!strcmp(cithost, UDS)) {
+ sprintf(sockpath, "citadel.socket");
+ serv_sock = uds_connectsock(sockpath);
+ if (hostbuf != NULL) strcpy(hostbuf, cithost);
+ if (portbuf != NULL) strcpy(portbuf, sockpath);
return;
}
- /* if using SOCKS, connect first to the proxy... */
- serv_sock = connectsock(socks4, "1080", "tcp");
- printf("Connected to SOCKS proxy at %s.\n", socks4);
- printf("Attaching to server...\r");
- fflush(stdout);
-
- snprintf(buf, sizeof buf, "%c%c",
- 4, /* version 4 */
- 1); /* method = connect */
- serv_write(buf, 2);
-
- numericize(buf, cithost, citport, "tcp");
- serv_write(buf, 6); /* port and address */
-
- p = (struct passwd *) getpwuid(getuid());
- serv_write(p->pw_name, strlen(p->pw_name) + 1);
- /* user name */
- serv_read(buf, 8); /* get response */
-
- if (buf[1] != 90) {
- printf("SOCKS server denied this proxy request.\n");
- logoff(3);
- }
+ serv_sock = connectsock(cithost, citport, "tcp", 504);
+ if (hostbuf != NULL) strcpy(hostbuf, cithost);
+ if (portbuf != NULL) strcpy(portbuf, citport);
+ return;
}
/*
return (ch);
}
+