aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-03-31 00:40:33 +0800
committerDan Winship <danw@src.gnome.org>2000-03-31 00:40:33 +0800
commit1f73bf3ba08bb281057a6c79a70b84c4547ab15a (patch)
tree0a26f2801cd012db21f29681efaf66e0dd53dc5e /camel/providers
parent809aec4f0ee7d202cca898f8a5320a907b064a11 (diff)
downloadgsoc2013-evolution-1f73bf3ba08bb281057a6c79a70b84c4547ab15a.tar
gsoc2013-evolution-1f73bf3ba08bb281057a6c79a70b84c4547ab15a.tar.gz
gsoc2013-evolution-1f73bf3ba08bb281057a6c79a70b84c4547ab15a.tar.bz2
gsoc2013-evolution-1f73bf3ba08bb281057a6c79a70b84c4547ab15a.tar.lz
gsoc2013-evolution-1f73bf3ba08bb281057a6c79a70b84c4547ab15a.tar.xz
gsoc2013-evolution-1f73bf3ba08bb281057a6c79a70b84c4547ab15a.tar.zst
gsoc2013-evolution-1f73bf3ba08bb281057a6c79a70b84c4547ab15a.zip
Add a htons in the default_number case, and document the fact that the
* camel-service.c (camel_service_getport): Add a htons in the default_number case, and document the fact that the function returns the port in network byte order. * providers/pop3/camel-pop3-store.c (pop3_connect): Revert Miguel's change. The port number bug was actually somewhere else, and the IP address copying code was fine already. svn path=/trunk/; revision=2256
Diffstat (limited to 'camel/providers')
-rw-r--r--camel/providers/pop3/camel-pop3-store.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index b41c27b0aa..543a6ce532 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -233,13 +233,8 @@ pop3_connect (CamelService *service, CamelException *ex)
}
sin.sin_family = h->h_addrtype;
- sin.sin_port = htons (port);
-
- /*
- * We copy only 4 bytes, as we can not trust h->h_length, as it
- * comes from the DNS and might have been tampered with.
- */
- memcpy (&sin.sin_addr, h->h_addr, 4);
+ sin.sin_port = port;
+ memcpy (&sin.sin_addr, h->h_addr, sizeof (sin.sin_addr));
fd = socket (h->h_addrtype, SOCK_STREAM, 0);
if (fd == -1 ||