HUGE PATCH. This moves all of mime_parser.c and all

[citadel.git] / citadel / domain.c

diff --git a/citadel/domain.c b/citadel/domain.c
index ac47dcb7eaf6cbea3553a2507ee4c04001c84d3b..da1c9bf9544020d10f4d0314435b31f55bc8222b 100644 (file)
--- a/citadel/domain.c
+++ b/citadel/domain.c
@@ -14,14 +14,16 @@
 
 #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"
 
 
@@ -35,8 +37,8 @@
 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);
@@ -44,9 +46,9 @@ int get_hosts(char *mxbuf, char *rectype) {
 
        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);
@@ -64,7 +66,13 @@ int get_hosts(char *mxbuf, char *rectype) {
  * 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);
        }
@@ -77,33 +85,6 @@ inline int mx_compare_pref(int pref1, int pref2) {
 }
 
 
-/*
- * 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()
  *
@@ -142,7 +123,6 @@ int getmx(char *mxbuf, char *dest) {
        n = get_hosts(mxbuf, "smarthost");
        if (n > 0) return(n);
 
-
        /*
         * No smart-host?  Look up the best MX for a site.
         */
@@ -152,16 +132,12 @@ int getmx(char *mxbuf, char *dest) {
        /*
         * On systems with b0rken or non-standard resolver libraries, learn
         * the MX records by calling "nslookup" from the command line.
+        *
+        * Someday.
+        *
         */
-       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 */
+
+       return(0);
 
 #else /* HAVE_RESOLV_H */
 
@@ -174,7 +150,7 @@ int getmx(char *mxbuf, char *dest) {
                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;
@@ -191,7 +167,7 @@ int getmx(char *mxbuf, char *dest) {
        
                for (qdcount = ntohs(answer.header.qdcount); qdcount--; ptr += ret + QFIXEDSZ) {
                        if ((ret = dn_skipname(ptr, endptr)) < 0) {
-                               lprintf(9, "dn_skipname error\n");
+                               lprintf(CTDL_DEBUG, "dn_skipname error\n");
                                return(0);
                        }
                }
@@ -227,10 +203,10 @@ int getmx(char *mxbuf, char *dest) {
        
                                ++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) );
                                }
        
@@ -242,13 +218,16 @@ int getmx(char *mxbuf, char *dest) {
        }
 #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);
 }