*
*/
+#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <string.h>
+#include <errno.h>
#include "citadel.h"
-#include "ipc.h"
+#include "citadel_ipc.h"
#include "tools.h"
void logoff(int code)
{
char buf[512];
char nodetitle[SIZ];
- int a;
int www = 0;
int s_pid = 0;
int my_pid = 0;
char s_room[SIZ];
char s_host[SIZ];
char s_client[SIZ];
+ int r; /* IPC response code */
+ time_t timenow;
+ char *listing = NULL;
+ CtdlIPC *ipc = NULL;
/* If this environment variable is set, we assume that the program
* is being called as a cgi-bin from a webserver and will output
*/
if (getenv("REQUEST_METHOD") != NULL) www = 1;
- attach_to_server(argc, argv, hostbuf, portbuf);
- serv_gets(buf);
+ ipc = CtdlIPC_new(argc, argv, hostbuf, portbuf);
+ if (!ipc) {
+ fprintf(stderr, "Server not available: %s\n", strerror(errno));
+ logoff(errno);
+ }
+ CtdlIPC_chat_recv(ipc, buf);
if ((buf[0]!='2')&&(strncmp(buf,"551",3))) {
fprintf(stderr,"%s: %s\n",argv[0],&buf[4]);
logoff(atoi(buf));
}
- strcpy(nodetitle, "this BBS");
- serv_puts("INFO");
- serv_gets(buf);
- if (buf[0]=='1') {
- a = 0;
- while (serv_gets(buf), strcmp(buf,"000")) {
- if (a==0) my_pid = atoi(buf);
- if (a==2) strcpy(nodetitle, buf);
- ++a;
- }
- }
+ strcpy(nodetitle, "this Citadel site");
+ r = CtdlIPCServerInfo(ipc, buf);
+ if (r / 100 == 1) {
+ my_pid = ipc->ServInfo.pid;
+ strcpy(nodetitle, ipc->ServInfo.humannode);
+ }
if (www) {
printf( "Content-type: text/html\n"
printf("</H1>\n");
}
- serv_puts("RWHO");
- serv_gets(buf);
- if (buf[0]!='1') {
- fprintf(stderr,"%s: %s\n",argv[0],&buf[4]);
+ r = CtdlIPCOnlineUsers(ipc, &listing, &timenow, buf);
+ if (r / 100 != 1) {
+ fprintf(stderr,"%s: %s\n",argv[0], buf);
logoff(atoi(buf));
}
printf( "Session User name "
"Room From host\n");
printf( "------- ------------------------- "
- "-------------------- ------------------------\n");
+ "------------------- ------------------------\n");
}
- while (serv_gets(buf), strcmp(buf,"000")) {
+ while (strlen(listing) > 0) {
+ extract_token(buf, listing, 0, '\n', sizeof buf);
+ remove_token(listing, 0, '\n');
/* Escape some stuff if we're using www mode */
if (www) escapize(buf, sizeof buf);
s_pid = extract_int(buf,0);
- extract(s_user,buf,1);
- extract(s_room,buf,2);
- extract(s_host,buf,3);
- extract(s_client,buf,4);
+ extract_token(s_user, buf, 1, '|', sizeof s_user);
+ extract_token(s_room, buf, 2, '|', sizeof s_room);
+ extract_token(s_host, buf, 3, '|', sizeof s_host);
+ extract_token(s_client, buf, 4, '|', sizeof s_client);
if (s_pid != my_pid) {
if (www) printf("<TR><TD>");
printf("%c",
((s_pid == my_pid) ? '*' : ' '));
if (www) printf("</TD><TD>");
- printf("%-25s", s_user);
+ printf("%-26s", s_user);
if (www) printf("</TD><TD>");
- printf("%-20s ", s_room);
+ printf("%-19s ", s_room);
if (www) printf("</TD><TD>");
printf("%-24s\n", s_host);
if (www) printf("</TD><TD>%s</TD></TR>\n", s_client);
}
}
+ free(listing);
if (www) printf("</TABLE></CENTER>\n"
"<FONT SIZE=-1>"
"once per minute)</FONT>\n"
"</BODY></HTML>\n");
- serv_puts("QUIT");
- serv_gets(buf);
- return 0;
- }
+ r = CtdlIPCQuit(ipc);
+ return (r / 100 == 2) ? 0 : r;
+}
#ifndef HAVE_STRERROR