masqmail

annotate src/connect.c @ 400:6500db550a03

find changesets by author, revision, files, or words in the commit message
resolve_ip() appeared to be broken, in connect.c. I fixed it. In any case, NULL was returned, but if it is a valid IP address, a list should have been returned. This is fixed now.
author markus schnalke <meillo@marmaro.de>
date Tue, 21 Feb 2012 15:44:55 +0100
parents 19d57eb1b6a1
children 885e3d886199
rev   line source
meillo@367 1 /*
meillo@367 2 ** MasqMail
meillo@367 3 ** Copyright (C) 1999 Oliver Kurth
meillo@367 4 **
meillo@367 5 ** This program is free software; you can redistribute it and/or modify
meillo@367 6 ** it under the terms of the GNU General Public License as published by
meillo@367 7 ** the Free Software Foundation; either version 2 of the License, or
meillo@367 8 ** (at your option) any later version.
meillo@367 9 **
meillo@367 10 ** This program is distributed in the hope that it will be useful,
meillo@367 11 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
meillo@367 12 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
meillo@367 13 ** GNU General Public License for more details.
meillo@367 14 **
meillo@367 15 ** You should have received a copy of the GNU General Public License
meillo@367 16 ** along with this program; if not, write to the Free Software
meillo@367 17 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
meillo@0 18 */
meillo@0 19 #include "masqmail.h"
meillo@0 20
meillo@10 21 static GList*
meillo@400 22 resolve_ip(gchar *ip)
meillo@0 23 {
meillo@10 24 struct in_addr ia;
meillo@400 25 mxip_addr mxip;
meillo@10 26
meillo@400 27 if (!inet_aton(ip, &ia)) {
meillo@400 28 /* No dots-and-numbers notation. */
meillo@400 29 return NULL;
meillo@10 30 }
meillo@400 31 mxip.name = g_strdup(ip);
meillo@400 32 mxip.pref = 0;
meillo@400 33 mxip.ip = (guint32) * (guint32 *) (&ia);
meillo@400 34 return g_list_append(NULL, g_memdup(&mxip, sizeof(mxip)));
meillo@0 35 }
meillo@0 36
meillo@10 37 mxip_addr*
meillo@366 38 connect_hostlist(int *psockfd, gchar *host, guint port, GList *addr_list)
meillo@0 39 {
meillo@10 40 GList *addr_node;
meillo@10 41 struct sockaddr_in saddr;
meillo@0 42
meillo@10 43 DEBUG(5) debugf("connect_hostlist entered\n");
meillo@0 44
meillo@10 45 for (addr_node = g_list_first(addr_list); addr_node; addr_node = g_list_next(addr_node)) {
meillo@10 46 mxip_addr *addr = (mxip_addr *) (addr_node->data);
meillo@0 47
meillo@10 48 *psockfd = socket(PF_INET, SOCK_STREAM, 0);
meillo@0 49
meillo@10 50 memset(&saddr, 0, sizeof(saddr));
meillo@0 51
meillo@10 52 saddr.sin_family = AF_INET;
meillo@10 53 saddr.sin_port = htons(port);
meillo@0 54
meillo@10 55 /* clumsy, but makes compiler happy: */
meillo@10 56 saddr.sin_addr = *(struct in_addr *) (&(addr->ip));
meillo@114 57 DEBUG(5) debugf(" trying ip %s port %d\n", inet_ntoa(saddr.sin_addr), port);
meillo@10 58 if (connect(*psockfd, (struct sockaddr *) (&saddr), sizeof(saddr)) == 0) {
meillo@114 59 DEBUG(5) debugf(" connected to %s\n", inet_ntoa(saddr.sin_addr));
meillo@10 60 return addr;
meillo@10 61 } else {
meillo@10 62 int saved_errno = errno;
meillo@0 63
meillo@10 64 close(*psockfd);
meillo@0 65
meillo@10 66 logwrite(LOG_WARNING, "connection to %s failed: %s\n", inet_ntoa(saddr.sin_addr), strerror(errno));
meillo@0 67
meillo@10 68 errno = saved_errno;
meillo@0 69
meillo@10 70 if ((saved_errno != ECONNREFUSED)
meillo@10 71 && (saved_errno != ETIMEDOUT)
meillo@10 72 && (saved_errno != ENETUNREACH)
meillo@10 73 && (saved_errno != EHOSTUNREACH))
meillo@10 74 return NULL;
meillo@10 75 }
meillo@10 76 }
meillo@0 77 return NULL;
meillo@0 78 }
meillo@0 79
meillo@367 80 /*
meillo@367 81 ** Given a list of resolver functions, this function
meillo@367 82 ** resolve the host and tries to connect to the addresses
meillo@367 83 ** returned. If a connection attemp is timed out or refused,
meillo@367 84 ** the next address is tried.
meillo@367 85 **
meillo@367 86 ** TODO: the resolver functions might return duplicate addresses,
meillo@367 87 ** if attempt failed for one it should not be tried again.
meillo@0 88 */
meillo@10 89 mxip_addr*
meillo@366 90 connect_resolvelist(int *psockfd, gchar *host, guint port, GList *res_func_list)
meillo@0 91 {
meillo@10 92 GList *res_node;
meillo@10 93 GList *addr_list;
meillo@0 94
meillo@10 95 DEBUG(5) debugf("connect_resolvelist entered\n");
meillo@0 96
meillo@10 97 h_errno = 0;
meillo@0 98
meillo@400 99 if (isdigit(*host)) {
meillo@10 100 mxip_addr *addr;
meillo@0 101
meillo@400 102 if ((addr_list = resolve_ip(host))) {
meillo@10 103 addr = connect_hostlist(psockfd, host, port, addr_list);
meillo@10 104 g_list_free(addr_list);
meillo@10 105 return addr;
meillo@10 106 }
meillo@367 107 /*
meillo@400 108 ** Probably a hostname that begins with a digit.
meillo@400 109 ** E.g. '3dwars.de'. Thus fall ...
meillo@367 110 */
meillo@10 111 }
meillo@0 112
meillo@10 113 if (res_func_list == NULL) {
meillo@10 114 logwrite(LOG_ALERT, "res_funcs == NULL !!!\n");
meillo@262 115 exit(1);
meillo@10 116 }
meillo@0 117
meillo@10 118 foreach(res_func_list, res_node) {
meillo@10 119 resolve_func res_func;
meillo@114 120 DEBUG(6) debugf(" foreach() body\n");
meillo@10 121 res_func = (resolve_func) (res_node->data);
meillo@10 122
meillo@10 123 if (res_func == NULL) {
meillo@10 124 logwrite(LOG_ALERT, "res_func == NULL !!!\n");
meillo@262 125 exit(1);
meillo@10 126 }
meillo@10 127
meillo@10 128 errno = 0;
meillo@10 129 if ((addr_list = res_func(NULL, host))) {
meillo@10 130
meillo@10 131 mxip_addr *addr;
meillo@10 132 if ((addr = connect_hostlist(psockfd, host, port, addr_list)))
meillo@10 133 return addr;
meillo@10 134
meillo@10 135 DEBUG(5) {
meillo@10 136 debugf("connect_hostlist failed: %s\n", strerror(errno));
meillo@10 137 }
meillo@10 138
meillo@10 139 g_list_free(addr_list);
meillo@369 140 } else if (!g_list_next(res_node)) {
meillo@369 141 logwrite(LOG_ALERT, "could not resolve %s: %s\n", host, hstrerror(h_errno));
meillo@10 142 }
meillo@10 143 }
meillo@10 144 return NULL;
meillo@0 145
meillo@0 146 }