Mercurial > dovecot > core-2.2

changeset 1485:8c28289a15a1 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
s/host/addr/ in a few network functions
author Timo Sirainen <tss@iki.fi>
date Sun, 18 May 2003 19:37:04 +0300
parents 8b3e16678100
children 2f5b3da28dd9
files src/imap-login/client.c src/lib/fd-close-on-exec.c src/lib/network.c src/lib/network.h src/login-common/ssl-proxy-gnutls.c src/login-common/ssl-proxy-openssl.c src/master/mail-process.c src/pop3-login/client.c
diffstat 8 files changed, 39 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap-login/client.c	Sun May 18 19:26:26 2003 +0300
+++ b/src/imap-login/client.c	Sun May 18 19:37:04 2003 +0300
@@ -49,7 +49,7 @@
 	if (!verbose_proctitle || !process_per_connection)
 		return;
 
-	host = net_ip2host(&client->common.ip);
+	host = net_ip2addr(&client->common.ip);
 	if (host == NULL)
 		host = "??";
 
@@ -438,7 +438,7 @@
 {
 	const char *host;
 
-	host = net_ip2host(&client->common.ip);
+	host = net_ip2addr(&client->common.ip);
 	if (host == NULL)
 		host = "??";
 
--- a/src/lib/fd-close-on-exec.c	Sun May 18 19:26:26 2003 +0300
+++ b/src/lib/fd-close-on-exec.c	Sun May 18 19:37:04 2003 +0300
@@ -68,7 +68,7 @@
 				}
 
 				i_panic("Leaked socket fd %d: %s:%u",
-					first_fd, net_ip2host(&addr), port);
+					first_fd, net_ip2addr(&addr), port);
 			}
 
 			if (fstat(first_fd, &st) == 0) {
--- a/src/lib/network.c	Sun May 18 19:26:26 2003 +0300
+++ b/src/lib/network.c	Sun May 18 19:37:04 2003 +0300
@@ -499,16 +499,16 @@
 	return 0;
 }
 
-const char *net_ip2host(const struct ip_addr *ip)
+const char *net_ip2addr(const struct ip_addr *ip)
 {
 #ifdef HAVE_IPV6
-	char host[MAX_IP_LEN+1];
+	char addr[MAX_IP_LEN+1];
 
-	host[MAX_IP_LEN] = '\0';
-	if (inet_ntop(ip->family, &ip->ip, host, MAX_IP_LEN) == NULL)
+	addr[MAX_IP_LEN] = '\0';
+	if (inet_ntop(ip->family, &ip->ip, addr, MAX_IP_LEN) == NULL)
 		return NULL;
 
-	return t_strdup(host);
+	return t_strdup(addr);
 #else
 	unsigned long ip4;
 
@@ -525,13 +525,13 @@
 	return 0;
 }
 
-int net_host2ip(const char *host, struct ip_addr *ip)
+int net_addr2ip(const char *addr, struct ip_addr *ip)
 {
-	if (strchr(host, ':') != NULL) {
+	if (strchr(addr, ':') != NULL) {
 		/* IPv6 */
 		ip->family = AF_INET6;
 #ifdef HAVE_IPV6
-		if (inet_pton(AF_INET6, host, &ip->ip) == 0)
+		if (inet_pton(AF_INET6, addr, &ip->ip) == 0)
 			return -1;
 #else
 		ip->ip.s_addr = 0;
@@ -539,7 +539,7 @@
  	} else {
 		/* IPv4 */
 		ip->family = AF_INET;
-		if (inet_aton(host, (struct in_addr *) &ip->ip) == 0)
+		if (inet_aton(addr, (struct in_addr *) &ip->ip) == 0)
 			return -1;
 	}
 
@@ -607,23 +607,23 @@
 	return entry == NULL ? NULL : entry->s_name;
 }
 
-int is_ipv4_address(const char *host)
+int is_ipv4_address(const char *addr)
 {
-	while (*host != '\0') {
-		if (*host != '.' && !i_isdigit(*host))
+	while (*addr != '\0') {
+		if (*addr != '.' && !i_isdigit(*addr))
 			return 0;
-                host++;
+                addr++;
 	}
 
 	return 1;
 }
 
-int is_ipv6_address(const char *host)
+int is_ipv6_address(const char *addr)
 {
-	while (*host != '\0') {
-		if (*host != ':' && !i_isxdigit(*host))
+	while (*addr != '\0') {
+		if (*addr != ':' && !i_isxdigit(*addr))
 			return 0;
-                host++;
+                addr++;
 	}
 
 	return 1;
--- a/src/lib/network.h	Sun May 18 19:26:26 2003 +0300
+++ b/src/lib/network.h	Sun May 18 19:37:04 2003 +0300
@@ -91,9 +91,9 @@
 int net_getsockname(int fd, struct ip_addr *addr, unsigned int *port);
 
 /* Returns ip_addr as string, or NULL if ip is invalid. */
-const char *net_ip2host(const struct ip_addr *ip);
+const char *net_ip2addr(const struct ip_addr *ip);
 /* char* -> struct ip_addr translation. */
-int net_host2ip(const char *host, struct ip_addr *ip);
+int net_addr2ip(const char *addr, struct ip_addr *ip);
 
 /* Get socket error */
 int net_geterror(int fd);
@@ -101,7 +101,7 @@
 /* Get name of TCP service */
 char *net_getservbyport(unsigned short port);
 
-int is_ipv4_address(const char *host);
-int is_ipv6_address(const char *host);
+int is_ipv4_address(const char *addr);
+int is_ipv6_address(const char *addr);
 
 #endif
--- a/src/login-common/ssl-proxy-gnutls.c	Sun May 18 19:26:26 2003 +0300
+++ b/src/login-common/ssl-proxy-gnutls.c	Sun May 18 19:37:04 2003 +0300
@@ -68,11 +68,11 @@
 		if (error == GNUTLS_E_WARNING_ALERT_RECEIVED) {
 			i_warning("Received SSL warning alert: %s [%s]",
 				  get_alert_text(proxy),
-				  net_ip2host(&proxy->ip));
+				  net_ip2addr(&proxy->ip));
 		} else {
 			i_warning("Non-fatal SSL error: %s: %s",
 				  get_alert_text(proxy),
-				  net_ip2host(&proxy->ip));
+				  net_ip2addr(&proxy->ip));
 		}
 		return 0;
 	}
@@ -82,11 +82,11 @@
 		if (error == GNUTLS_E_FATAL_ALERT_RECEIVED) {
 			i_warning("Received SSL fatal alert: %s [%s]",
 				  get_alert_text(proxy),
-				  net_ip2host(&proxy->ip));
+				  net_ip2addr(&proxy->ip));
 		} else {
 			i_warning("Error reading from SSL client: %s [%s]",
 				  gnutls_strerror(error),
-				  net_ip2host(&proxy->ip));
+				  net_ip2addr(&proxy->ip));
 		}
 	}
 
--- a/src/login-common/ssl-proxy-openssl.c	Sun May 18 19:26:26 2003 +0300
+++ b/src/login-common/ssl-proxy-openssl.c	Sun May 18 19:37:04 2003 +0300
@@ -198,7 +198,7 @@
 			}
 
 			i_warning("%s syscall failed: %s [%s]",
-				  func, errstr, net_ip2host(&proxy->ip));
+				  func, errstr, net_ip2addr(&proxy->ip));
 		}
 		ssl_proxy_destroy(proxy);
 		break;
@@ -209,13 +209,13 @@
 	case SSL_ERROR_SSL:
 		if (verbose_ssl) {
 			i_warning("%s failed: %s [%s]", func, ssl_last_error(),
-				  net_ip2host(&proxy->ip));
+				  net_ip2addr(&proxy->ip));
 		}
 		ssl_proxy_destroy(proxy);
 		break;
 	default:
 		i_warning("%s failed: unknown failure %d (%s) [%s]",
-			  func, err, ssl_last_error(), net_ip2host(&proxy->ip));
+			  func, err, ssl_last_error(), net_ip2addr(&proxy->ip));
 		ssl_proxy_destroy(proxy);
 		break;
 	}
--- a/src/master/mail-process.c	Sun May 18 19:26:26 2003 +0300
+++ b/src/master/mail-process.c	Sun May 18 19:37:04 2003 +0300
@@ -105,7 +105,7 @@
 			struct auth_master_reply *reply, const char *data)
 {
 	static const char *argv[] = { NULL, NULL, NULL };
-	const char *host, *mail, *chroot_dir, *home_dir, *full_home_dir;
+	const char *addr, *mail, *chroot_dir, *home_dir, *full_home_dir;
 	char title[1024];
 	pid_t pid;
 	int i, err;
@@ -216,15 +216,15 @@
 	env_put(t_strconcat("MAIL=", mail, NULL));
 	env_put(t_strconcat("USER=", data + reply->virtual_user_idx, NULL));
 
-	host = net_ip2host(ip);
-	env_put(t_strconcat("IP=", host, NULL));
+	addr = net_ip2addr(ip);
+	env_put(t_strconcat("IP=", addr, NULL));
 
 	if (set->verbose_proctitle) {
-		if (host == NULL)
-			host = "??";
+		if (addr == NULL)
+			addr = "??";
 
 		i_snprintf(title, sizeof(title), "[%s %s]",
-			   data + reply->virtual_user_idx, host);
+			   data + reply->virtual_user_idx, addr);
 		argv[1] = title;
 	}
 
--- a/src/pop3-login/client.c	Sun May 18 19:26:26 2003 +0300
+++ b/src/pop3-login/client.c	Sun May 18 19:37:04 2003 +0300
@@ -42,7 +42,7 @@
 	if (!verbose_proctitle || !process_per_connection)
 		return;
 
-	host = net_ip2host(&client->common.ip);
+	host = net_ip2addr(&client->common.ip);
 	if (host == NULL)
 		host = "??";
 
@@ -323,7 +323,7 @@
 {
 	const char *host;
 
-	host = net_ip2host(&client->common.ip);
+	host = net_ip2addr(&client->common.ip);
 	if (host == NULL)
 		host = "??";