#define MIN(a, b) ((a) < (b) ? (a) : (b))
-extern struct CtdlServInfo serv_info;
extern char temp[];
void getline(char *, int);
struct timeval tv;
int retval;
- CtdlIPC_putline(ipc, "CHAT");
- CtdlIPC_getline(ipc, buf);
+ CtdlIPC_chat_send(ipc, "CHAT");
+ CtdlIPC_chat_recv(ipc, buf);
if (buf[0] != '8') {
scr_printf("%s\n", &buf[4]);
return;
}
- scr_printf("Entering chat mode (type /quit to exit, /help for other cmds)\n");
+ scr_printf("Entering chat mode "
+ "(type /quit to exit, /help for other cmds)\n");
set_keepalives(KA_NO);
last_transmit = time(NULL);
FD_SET(CtdlIPC_getsockfd(ipc), &rfds);
tv.tv_sec = S_KEEPALIVE;
tv.tv_usec = 0;
- retval = select(CtdlIPC_getsockfd(ipc) + 1, &rfds, NULL, NULL, &tv);
+ retval = select(CtdlIPC_getsockfd(ipc) + 1, &rfds,
+ NULL, NULL, &tv);
+ /* If there's data from the server... */
if (FD_ISSET(CtdlIPC_getsockfd(ipc), &rfds)) {
- ch = CtdlIPC_get(ipc);
- if (ch == 10) {
- recv_complete_line = 1;
- goto RCL; /* ugly, but we've gotta get out! */
- } else {
- buf[strlen(buf) + 1] = 0;
- buf[strlen(buf)] = ch;
- }
- goto RCL;
+ CtdlIPC_chat_recv(ipc, buf);
+ recv_complete_line = 1;
+ goto RCL; /* ugly, but we've gotta get out! */
}
+
+ /* If there's data from the keyboard... */
if (FD_ISSET(0, &rfds)) {
ch = scr_getc(SCR_BLOCK);
if ((ch == 10) || (ch == 13)) {
wbuf[strlen(wbuf)] = ch;
}
}
+
/* if the user hit return, send the line */
- RCL:if (send_complete_line) {
- CtdlIPC_putline(ipc, wbuf);
+RCL: if (send_complete_line) {
+ CtdlIPC_chat_send(ipc, wbuf);
last_transmit = time(NULL);
strcpy(wbuf, "");
send_complete_line = 0;
}
+
/* if it's time to word wrap, send a partial line */
if (strlen(wbuf) >= (77 - strlen(fullname))) {
pos = 0;
pos = a;
}
if (pos == 0) {
- CtdlIPC_putline(ipc, wbuf);
+ CtdlIPC_chat_send(ipc, wbuf);
last_transmit = time(NULL);
strcpy(wbuf, "");
send_complete_line = 0;
} else {
wbuf[pos] = 0;
- CtdlIPC_putline(ipc, wbuf);
+ CtdlIPC_chat_send(ipc, wbuf);
last_transmit = time(NULL);
strcpy(wbuf, &wbuf[pos + 1]);
}
}
+
if (recv_complete_line) {
sln_printf("\r%79s\r", "");
if (!strcmp(buf, "000")) {
sln_flush();
set_keepalives(KA_YES);
- /* Some users complained about the client and server
- * losing protocol synchronization when exiting chat.
- * This little dialog forces everything to be
- * hunky-dory.
+ /* Some users complained about the client and
+ * server losing protocol synchronization when
+ * exiting chat. This little dialog forces
+ * everything to be hunky-dory.
*/
- CtdlIPC_putline(ipc, "ECHO __ExitingChat__");
+ CtdlIPC_chat_send(ipc, "ECHO __ExitingChat__");
do {
- CtdlIPC_getline(ipc, buf);
+ CtdlIPC_chat_recv(ipc, buf);
} while (strcmp(buf, "200 __ExitingChat__"));
-
-
return;
}
if (num_parms(buf) >= 2) {
- extract(c_user, buf, 0);
- extract(c_text, buf, 1);
+ extract_token(c_user, buf, 0, '|', sizeof c_user);
+ extract_token(c_text, buf, 1, '|', sizeof c_text);
if (num_parms(buf) > 2) {
- extract(c_room, buf, 2);
+ extract_token(c_room, buf, 2, '|', sizeof c_room);
scr_printf("Got room %s\n", c_room);
}
if (strcasecmp(c_text, "NOOP")) {
* server to prevent session timeout.
*/
if ((time(NULL) - last_transmit) >= S_KEEPALIVE) {
- CtdlIPC_putline(ipc, "NOOP");
+ CtdlIPC_chat_send(ipc, "NOOP");
last_transmit = time(NULL);
}
}
/*
- * send an express message
+ * send an instant message
*/
void page_user(CtdlIPC *ipc)
{
strprompt("Page who", touser, 30);
/* old server -- use inline paging */
- if (serv_info.serv_paging_level == 0) {
+ if (ipc->ServInfo.paging_level == 0) {
newprompt("Message: ", msg, 69);
snprintf(buf, sizeof buf, "SEXP %s|%s", touser, msg);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
+ CtdlIPC_chat_send(ipc, buf);
+ CtdlIPC_chat_recv(ipc, buf);
if (!strncmp(buf, "200", 3)) {
strcpy(last_paged, touser);
}
return;
}
/* new server -- use extended paging */
- else if (serv_info.serv_paging_level >= 1) {
+ else if (ipc->ServInfo.paging_level >= 1) {
snprintf(buf, sizeof buf, "SEXP %s||", touser);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
+ CtdlIPC_chat_send(ipc, buf);
+ CtdlIPC_chat_recv(ipc, buf);
if (buf[0] != '2') {
scr_printf("%s\n", &buf[4]);
return;
pagefp = fopen(temp, "r");
unlink(temp);
snprintf(buf, sizeof buf, "SEXP %s|-", touser);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
+ CtdlIPC_chat_send(ipc, buf);
+ CtdlIPC_chat_recv(ipc, buf);
if (buf[0] == '4') {
strcpy(last_paged, touser);
while (fgets(buf, sizeof buf, pagefp) != NULL) {
buf[strlen(buf) - 1] = 0;
- CtdlIPC_putline(ipc, buf);
+ CtdlIPC_chat_send(ipc, buf);
}
fclose(pagefp);
- CtdlIPC_putline(ipc, "000");
+ CtdlIPC_chat_send(ipc, "000");
scr_printf("Message sent.\n");
} else {
scr_printf("%s\n", &buf[4]);