oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New file.

Browse Source 
1998-07-14  Martin Baulig  <martin@home-of-linux.org>

	* src/daemon/slave.c: New file.

	* src/daemon/*.c: Done some more work on the daemon.

	* sysdeps/common/gnuslib.c: Removed IPC stuff.

	* include/glibtop/gnuserv.h: Removed IPC stuff.

	* include/glibtop/command.h (glibtop_response_unit): Added
	typedef for `struct _glibtop_response_unit'.

	* lib/Makefile.am: Using `$(top_srcdir)/features.def'
	instead of `$(top_builddir)/features.def'.

	* sysdeps/guile/Makefile.am: Using `$(top_srcdir)/features.def'
	instead of `$(top_builddir)/features.def'.

	* sysdeps/guile/names/Makefile.am: Dito.

	* sysdeps/stub/*.c: changed suffix of all functions
	from '_s' to '_r'; see also ChangeLog entry from Jun 6.
This commit is contained in:
Martin Baulig
1998-07-13 23:27:10 +00:00
committed by Martin Baulig
parent da7d7ff116
commit 345a657d2c
10 changed files with 329 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
sysdeps/common/gnuslib.c
View File

@@ -29,26 +29,17 @@
* ../etc/gnuserv.README relative to the directory containing this file)
*/
#if 0
static char rcsid[] = "!Header: gnuslib.c,v 2.4 95/02/16 11:57:37 arup alpha !";
#endif
#include <glibtop.h>
#include <glibtop/gnuserv.h>
#include <fcntl.h>
#ifdef SYSV_IPC
static int connect_to_ipc_server (void);
#endif
#ifdef UNIX_DOMAIN_SOCKETS
static int connect_to_unix_server (void);
static int connect_to_unix_server __P((void));
#endif
#ifdef INTERNET_DOMAIN_SOCKETS
static int connect_to_internet_server (const char *serverhost, u_short port);
#ifdef INTERNET_DOMAIN_SOCKETS
static int connect_to_internet_server __P((const char *, u_short));
#endif
/* On some systems, e.g. DGUX, inet_addr returns a 'struct in_addr'. */
@@ -93,10 +84,6 @@ glibtop_make_connection (hostarg, portarg, s)
#ifdef INTERNET_DOMAIN_SOCKETS
*s = connect_to_internet_server (hostarg, portarg);
return (int) CONN_INTERNET;
#endif
#ifdef SYSV_IPC
return -1; /* hostarg should always be NULL for SYSV_IPC
*/
#endif
} else {
/* no hostname given. Use unix-domain/sysv-ipc, or *
@@ -105,9 +92,6 @@ glibtop_make_connection (hostarg, portarg, s)
#if defined(UNIX_DOMAIN_SOCKETS)
*s = connect_to_unix_server ();
return (int) CONN_UNIX;
#elif defined(SYSV_IPC)
*s = connect_to_ipc_server ();
return (int) CONN_IPC;
#elif defined(INTERNET_DOMAIN_SOCKETS)
{
char localhost[HOSTNAMSZ];
@@ -122,69 +106,6 @@ glibtop_make_connection (hostarg, portarg, s)
}
}
#ifdef SYSV_IPC
/*
* connect_to_ipc_server -- establish connection with server process via SYSV IPC
* Returns msqid for server if successful.
*/
static int
connect_to_ipc_server (void)
{
int s; /* connected msqid */
key_t key; /* message key */
char buf[GSERV_BUFSZ + 1]; /* buffer for filename */
sprintf (buf, "/tmp/lgtd%d", (int) geteuid ());
creat (buf, 0600);
if ((key = ftok (buf, 1)) == -1)
glibtop_error_io ("unable to get ipc key from %s", buf);
if ((s = msgget (key, 0600)) == -1)
glibtop_error_io ("unable to access msg queue");
return (s);
} /* connect_to_ipc_server */
/*
* disconnect_from_ipc_server -- inform the server that sending has finished,
* and wait for its reply.
*/
void
disconnect_from_ipc_server (s, msgp, echo)
int s;
struct msgbuf *msgp;
int echo;
{
int len; /* length of received message */
send_string (s, EOT_STR); /* EOT terminates this message */
msgp->mtype = 1;
if (msgsnd (s, msgp, strlen (msgp->mtext) + 1, 0) < 0) {
perror (progname);
fprintf (stderr, "%s: unable to send message to server\n", progname);
exit (1);
}; /* if */
if ((len = msgrcv (s, msgp, GSERV_BUFSZ, getpid (), 0)) < 0) {
perror (progname);
fprintf (stderr, "%s: unable to receive message from server\n", progname);
exit (1);
}; /* if */
if (echo) {
msgp->mtext[len] = '\0'; /* string terminate message */
fputs (msgp->mtext, stdout);
if (msgp->mtext[len - 1] != '\n')
putchar ('\n');
}; /* if */
} /* disconnect_from_ipc_server */
#endif /* SYSV_IPC */
#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
/*
* send_string -- send string to socket.