*
* DNS lookup for SMTP sender
*
+ *
+ * Copyright (c) 1987-2009 by the citadel.org team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#ifdef HAVE_RESOLV_H
#include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
#include <resolv.h>
#endif
-
+#include <libcitadel.h>
#include "sysdep_decls.h"
#include "citadel.h"
#include "domain.h"
#include "server.h"
-#include "tools.h"
#include "internet_addressing.h"
int get_hosts(char *mxbuf, char *rectype) {
int config_lines;
int i;
- char buf[SIZ];
- char host[SIZ], type[SIZ];
+ char buf[256];
+ char host[256], type[256];
int total_smarthosts = 0;
if (inetcfg == NULL) return(0);
config_lines = num_tokens(inetcfg, '\n');
for (i=0; i<config_lines; ++i) {
- extract_token(buf, inetcfg, i, '\n');
- extract_token(host, buf, 0, '|');
- extract_token(type, buf, 1, '|');
+ extract_token(buf, inetcfg, i, '\n', sizeof buf);
+ extract_token(host, buf, 0, '|', sizeof host);
+ extract_token(type, buf, 1, '|', sizeof type);
if (!strcasecmp(type, rectype)) {
strcat(mxbuf, host);
* number listed in the MX record. If they're identical, randomize the
* result.
*/
-inline int mx_compare_pref(int pref1, int pref2) {
+int mx_compare_pref(const void *mx1, const void *mx2) {
+ int pref1;
+ int pref2;
+
+ pref1 = ((const struct mx *)mx1)->pref;
+ pref2 = ((const struct mx *)mx2)->pref;
+
if (pref1 > pref2) {
return(1);
}
}
-/*
- * sort_mxrecs()
- *
- * Sort a pile of MX records (struct mx, definted in domain.h) by preference
- *
- */
-void sort_mxrecs(struct mx *mxrecs, int num_mxrecs) {
- int a, b;
- struct mx hold1, hold2;
-
- if (num_mxrecs < 2) return;
-
- /* do the sort */
- for (a = num_mxrecs - 2; a >= 0; --a) {
- for (b = 0; b <= a; ++b) {
- if (mx_compare_pref(mxrecs[b].pref,mxrecs[b+1].pref)) {
- memcpy(&hold1, &mxrecs[b], sizeof(struct mx));
- memcpy(&hold2, &mxrecs[b+1], sizeof(struct mx));
- memcpy(&mxrecs[b], &hold2, sizeof(struct mx));
- memcpy(&mxrecs[b+1], &hold1, sizeof(struct mx));
- }
- }
- }
-}
-
-
-
/*
* getmx()
*
int ret;
unsigned char *startptr, *endptr, *ptr;
char expanded_buf[1024];
- char buf[SIZ];
- FILE *fp;
unsigned short pref, type;
int n = 0;
int qdcount;
n = get_hosts(mxbuf, "smarthost");
if (n > 0) return(n);
-
/*
* No smart-host? Look up the best MX for a site.
- */
-
-#ifndef HAVE_RESOLV_H
-
- /*
- * On systems with b0rken or non-standard resolver libraries, learn
- * the MX records by calling "nslookup" from the command line.
- */
- sprintf(buf, "nslookup -query=mx %s", dest);
- fp = popen(buf, "r");
- if (fp == NULL) return(0);
- while (fgets(buf, sizeof buf, fp) != NULL) {
- buf[strlen(buf) - 1] = 0;
- lprintf(9, "RESOLV: %s\n", buf);
- }
- pclose(fp);
- return(0); /* FIXME */
-
-#else /* HAVE_RESOLV_H */
-
- /*
- * Make a call to the standard resolver library.
+ * Make a call to the resolver library.
*/
ret = res_query(
C_IN, T_MX, (unsigned char *)answer.bytes, sizeof(answer) );
if (ret < 0) {
- mxrecs = mallok(sizeof(struct mx));
+ mxrecs = malloc(sizeof(struct mx));
mxrecs[0].pref = 0;
strcpy(mxrecs[0].host, dest);
num_mxrecs = 1;
for (qdcount = ntohs(answer.header.qdcount); qdcount--; ptr += ret + QFIXEDSZ) {
if ((ret = dn_skipname(ptr, endptr)) < 0) {
- lprintf(9, "dn_skipname error\n");
+ CtdlLogPrintf(CTDL_DEBUG, "dn_skipname error\n");
return(0);
}
}
++num_mxrecs;
if (mxrecs == NULL) {
- mxrecs = mallok(sizeof(struct mx));
+ mxrecs = malloc(sizeof(struct mx));
}
else {
- mxrecs = reallok(mxrecs,
+ mxrecs = realloc(mxrecs,
(sizeof(struct mx) * num_mxrecs) );
}
}
}
}
-#endif /* HAVE_RESOLV_H */
- sort_mxrecs(mxrecs, num_mxrecs);
+ /* Sort the MX records by preference */
+ if (num_mxrecs > 1) {
+ qsort(mxrecs, num_mxrecs, sizeof(struct mx), mx_compare_pref);
+ }
strcpy(mxbuf, "");
for (n=0; n<num_mxrecs; ++n) {
strcat(mxbuf, mxrecs[n].host);
strcat(mxbuf, "|");
}
- phree(mxrecs);
+ free(mxrecs);
return(num_mxrecs);
}
projects / citadel.git / blobdiff