#include <unistd.h>
#include <stdio.h>
#include <string.h>
+#include <errno.h>
#include "citadel.h"
#include "citadel_ipc.h"
-#include "ipc.h"
#include "tools.h"
void logoff(int code)
int r; /* IPC response code */
time_t timenow;
char *listing = NULL;
- struct CtdlServInfo *serv_info = 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");
- r = CtdlIPCServerInfo(serv_info, buf);
+ r = CtdlIPCServerInfo(ipc, buf);
if (r / 100 == 1) {
- my_pid = serv_info->serv_pid;
- strcpy(nodetitle, serv_info->serv_humannode);
+ my_pid = ipc->ServInfo.pid;
+ strcpy(nodetitle, ipc->ServInfo.humannode);
}
if (www) {
printf("</H1>\n");
}
- r = CtdlIPCOnlineUsers(&listing, &timenow, buf);
+ r = CtdlIPCOnlineUsers(ipc, &listing, &timenow, buf);
if (r / 100 != 1) {
fprintf(stderr,"%s: %s\n",argv[0], buf);
logoff(atoi(buf));
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");
- r = CtdlIPCQuit();
+ r = CtdlIPCQuit(ipc);
return (r / 100 == 2) ? 0 : r;
}