$Log$
+Revision 1.451 2000/01/23 21:25:45 ajc
+* Temporary hack to ig_tcp_server() to listen on an arbitrary port if the
+ one specified is not bindable (for development only)
+* Added SM_DONT_BUMP_REF flag to CtdlSaveMsgPointerInRoom() to be used only
+ in very specific and special situations
+* Generate delivery instructions when outbound SMTP mail is created from
+ within Citadel (as opposed to being from the SMTP module)
+
Revision 1.450 2000/01/23 05:22:41 ajc
* Coded up some more of the SMTP-sender (still not done)
Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
* Initial CVS import
+
whobbs.c sendcommand.c mime_parser.c base64.c qpdecode.c getutline.c \
auth.c chkpwd.c client_icq.c html.c vcard.c serv_upgrade.c \
serv_smtp.c serv_pop3.c internet_addressing.c parsedate.c genstamp.c \
- domain.c
+ domain.c clientsocket.c
DEP_FILES=$(SOURCES:.c=.d)
msgbase.ro config.ro sysdep.ro locate_host.ro housekeeping.ro \
database.ro control.ro logging.ro policy.ro dynloader.ro tools.ro \
mime_parser.ro html.ro internet_addressing.ro \
- parsedate.ro genstamp.ro \
+ parsedate.ro genstamp.ro clientsocket.ro \
$(AUTH) $(LIBOBJS:.o=.ro)
citserver: $(SERV_OBJS)
--- /dev/null
+/*
+ * $Id$
+ *
+ * This module handles client-side sockets opened by the Citadel server (for
+ * the client side of Internet protocols, etc.) It does _not_ handle client
+ * sockets for the Citadel client; for that you must look in ipc_c_tcp.c
+ * (which, uncoincidentally, bears a striking similarity to this file).
+ *
+ */
+
+#include "sysdep.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <string.h>
+#include <pwd.h>
+#include <errno.h>
+#include <stdarg.h>
+#include "citadel.h"
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+#include "sysdep_decls.h"
+
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
+int sock_connect(char *host, char *service, char *protocol)
+{
+ struct hostent *phe;
+ struct servent *pse;
+ struct protoent *ppe;
+ struct sockaddr_in sin;
+ int s, type;
+
+ memset(&sin, 0, sizeof(sin));
+ sin.sin_family = AF_INET;
+
+ pse = getservbyname(service, protocol);
+ if (pse) {
+ sin.sin_port = pse->s_port;
+ } else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
+ lprintf(3, "Can't get %s service entry: %s\n",
+ service, strerror(errno));
+ return(-1);
+ }
+ 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) {
+ lprintf(3, "Can't get %s host entry: %s\n",
+ host, strerror(errno));
+ return(-1);
+ }
+ if ((ppe = getprotobyname(protocol)) == 0) {
+ lprintf(3, "Can't get %s protocol entry: %s\n",
+ protocol, strerror(errno));
+ return(-1);
+ }
+ if (!strcmp(protocol, "udp")) {
+ type = SOCK_DGRAM;
+ } else {
+ type = SOCK_STREAM;
+ }
+
+ s = socket(PF_INET, type, ppe->p_proto);
+ if (s < 0) {
+ lprintf(3, "Can't create socket: %s\n", strerror(errno));
+ return(-1);
+ }
+
+/* FIX ... the alarm clock is a problem for multithreaded programs because all
+ * threads receive the signal.
+ signal(SIGALRM, timeout);
+ alarm(30);
+ */
+
+ if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
+ lprintf(3, "can't connect to %s.%s: %s\n",
+ host, service, strerror(errno));
+ return(-1);
+ }
+/*
+ alarm(0);
+ signal(SIGALRM, SIG_IGN);
+ */
+
+ return (s);
+}
+
+/*
+ * sock_read() - input binary data from socket.
+ * Returns the number of bytes read, or -1 for error.
+ */
+int sock_read(int sock, char *buf, int bytes)
+{
+ int len, rlen;
+
+ len = 0;
+ while (len < bytes) {
+ rlen = read(sock, &buf[len], bytes - len);
+ if (rlen < 1) {
+ return (-1);
+ }
+ len = len + rlen;
+ }
+ return (len);
+}
+
+
+/*
+ * sock_write() - send binary to server.
+ * Returns the number of bytes written, or -1 for error.
+ */
+int sock_write(int sock, char *buf, int nbytes)
+{
+ int bytes_written = 0;
+ int retval;
+ while (bytes_written < nbytes) {
+ retval = write(sock, &buf[bytes_written],
+ nbytes - bytes_written);
+ if (retval < 1) {
+ return (-1);
+ }
+ bytes_written = bytes_written + retval;
+ }
+ return (bytes_written);
+}
+
+
+/*
+ * Input string from socket - implemented in terms of sock_read()
+ *
+ */
+int sock_gets(int sock, char *buf)
+{
+ int i;
+
+ /* Read one character at a time.
+ */
+ for (i = 0;; i++) {
+ if (sock_read(sock, &buf[i], 1) < 0) return(-1);
+ if (buf[i] == '\n' || i == 255)
+ break;
+ }
+
+ /* If we got a long line, discard characters until the newline.
+ */
+ if (i == 255)
+ while (buf[i] != '\n')
+ if (sock_read(sock, &buf[i], 1) < 0) return(-1);
+
+ /* Strip any trailing CR and LF characters.
+ */
+ while ( (strlen(buf)>0)
+ && ((buf[strlen(buf)-1]==13)
+ || (buf[strlen(buf)-1]==10)) ) {
+ buf[strlen(buf)-1] = 0;
+ }
+ return(strlen(buf));
+}
+
+
+/*
+ * sock_puts() - send line to server - implemented in terms of serv_write()
+ * Returns the number of bytes written, or -1 for error.
+ */
+int sock_puts(int sock, char *buf)
+{
+ int i, j;
+
+ i = sock_write(sock, buf, strlen(buf));
+ if (i<0) return(i);
+ j = sock_write(sock, "\n", 1);
+ if (j<0) return(j);
+ return(i+j);
+}
--- /dev/null
+/*
+ * $Id$
+ *
+ * Header file for TCP client socket library
+ */
+
+int sock_connect(char *host, char *service, char *protocol);
+int sock_read(int sock, char *buf, int bytes);
+int sock_write(int sock, *buf, int nbytes);
+int *sock_gets(int sock, *buf);
+int sock_puts(int sock, *buf);
+
+/*
+ * This looks dumb, but it's being done for future portability
+ */
+#define sock_close(sock) close(sock)
getroom(&CC->quickroom, hold_rm);
/* Bump the reference count for this message. */
- AdjRefCount(msgid, +1);
+ if ((flags & SM_DONT_BUMP_REF)==0) {
+ AdjRefCount(msgid, +1);
+ }
/* Return success. */
if (msg != NULL) CtdlFreeMessage(msg);
static int seqnum = 1;
struct CtdlMessage *imsg;
char *instr;
+ long imsgid;
lprintf(9, "CtdlSaveMsg() called\n");
if (is_valid_message(msg) == 0) return(-1); /* self check */
/* Now figure out where to store the pointers */
lprintf(9, "Storing pointers\n");
-
/* If this is being done by the networker delivering a private
* message, we want to BYPASS saving the sender's copy (because there
* is no local sender; it would otherwise go to the Trashcan).
/* For internet mail, drop a copy in the outbound queue room */
if (mailtype == MES_INTERNET) {
CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0);
-
- /* And generate delivery instructions */
- lprintf(9, "Generating delivery instructions\n");
- instr = mallok(2048);
- sprintf(instr,
- "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
- "remote|%s|0||\n",
- SPOOLMIME, newmsgid, time(NULL), recipient );
-
- imsg = mallok(sizeof(struct CtdlMessage));
- memset(imsg, 0, sizeof(struct CtdlMessage));
- imsg->cm_magic = CTDLMESSAGE_MAGIC;
- imsg->cm_anon_type = MES_NORMAL;
- imsg->cm_format_type = FMT_RFC822;
- imsg->cm_fields['M'] = instr;
- CtdlSaveMsg(imsg, "", SMTP_SPOOLOUT_ROOM, MES_LOCAL, 1);
- CtdlFreeMessage(imsg);
}
/* Bump this user's messages posted counter. */
if (strcasecmp(hold_rm, CC->quickroom.QRname))
getroom(&CC->quickroom, hold_rm);
+ /* For internet mail, generate delivery instructions
+ * (Yes, this is recursive! Deal with it!)
+ */
+ if (mailtype == MES_INTERNET) {
+ lprintf(9, "Generating delivery instructions\n");
+ instr = mallok(2048);
+ sprintf(instr,
+ "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
+ "remote|%s|0||\n",
+ SPOOLMIME, newmsgid, time(NULL), recipient );
+
+ imsg = mallok(sizeof(struct CtdlMessage));
+ memset(imsg, 0, sizeof(struct CtdlMessage));
+ imsg->cm_magic = CTDLMESSAGE_MAGIC;
+ imsg->cm_anon_type = MES_NORMAL;
+ imsg->cm_format_type = FMT_RFC822;
+ imsg->cm_fields['M'] = instr;
+ imsgid = send_message(imsg, 1, NULL);
+ if (imsgid >= 0L) {
+ CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM,
+ imsgid,
+ SM_DONT_BUMP_REF);
+ }
+ CtdlFreeMessage(imsg);
+ }
+
return(newmsgid);
}
*/
begin_critical_section(S_SUPPMSGMAIN);
GetSuppMsgInfo(&smi, msgnum);
+ lprintf(9, "Ref count for message <%ld> before write is <%d>\n",
+ msgnum, smi.smi_refcount);
smi.smi_refcount += incr;
PutSuppMsgInfo(&smi);
end_critical_section(S_SUPPMSGMAIN);
-
lprintf(9, "Ref count for message <%ld> after write is <%d>\n",
msgnum, smi.smi_refcount);
*/
#define SM_VERIFY_GOODNESS 1 /* Verify this is a real msg number */
#define SM_DO_REPL_CHECK 2 /* Perform replication checks */
+#define SM_DONT_BUMP_REF 3 /* Don't bump reference count
+ (use with extreme care!!!!!!) */
/*
* These define what port to listen on for various services.
* FIX ... put this in a programmable config somewhere
*/
-#define POP3_PORT 1110
-#define SMTP_PORT 2525
+#define POP3_PORT 110
+#define SMTP_PORT 25
/*
if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
lprintf(1, "citserver: Can't bind: %s\n", strerror(errno));
- return(-1);
+ sin.sin_port = 0;
+ if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+ lprintf(1, "citserver: Can't bind: %s\n",
+ strerror(errno));
+ return(-1);
+ }
+ else {
+ lprintf(1, "bind to alternate port %d ok\n",
+ htons(sin.sin_port) );
+ }
}
if (listen(s, queue_len) < 0) {
projects / citadel.git / commitdiff