Small cleanup. The max_packet_size variable doesn't seem to be read

anywhere, and reworked string handling in ft_listen() a little bit.

2 files changed, 52 insertions, 37 deletions

diff --git a/lib/ftutil.c b/lib/ftutil.c
index 169a6480..d59dd4e0 100644
--- a/lib/ftutil.c
+++ b/lib/ftutil.c
@@ -27,63 +27,63 @@
 #include <netinet/tcp.h>
 #include "lib/ftutil.h"
 
-/* Some ifdefs for ulibc and apparently also BSD (Thanks to Whoopie) */
-#ifndef HOST_NAME_MAX
-#include <sys/param.h>
-#ifdef MAXHOSTNAMELEN
-#define HOST_NAME_MAX MAXHOSTNAMELEN
-#else
-#define HOST_NAME_MAX 255
-#endif
-#endif
-
 #define ASSERTSOCKOP(op, msg) \
 	if( (op) == -1 ) {\
-		sprintf( errmsg , msg ": %s", strerror( errno ) ); \
+		g_snprintf( errmsg, sizeof( errmsg ), msg ": %s", strerror( errno ) ); \
 		return -1; }
 
 /*
  * Creates a listening socket and returns it in saddr_ptr.
  */
-int ft_listen( struct sockaddr_storage *saddr_ptr, char *hostp, char *port, int for_bitlbee_client, char **errptr )
+int ft_listen( struct sockaddr_storage *saddr_ptr, char *host, char *port, int for_bitlbee_client, char **errptr )
 {
-	int fd,gret,saddrlen;
+	int fd, gret, saddrlen;
 	struct addrinfo hints, *rp;
 	socklen_t ssize = sizeof( struct sockaddr_storage );
 	struct sockaddr_storage saddrs, *saddr = &saddrs;
 	static char errmsg[1024];
-	char host[ HOST_NAME_MAX + 1 ];
 	char *ftlisten = global.conf->ft_listen;
 
-	*errptr = errmsg;
+	if( errptr )
+		*errptr = errmsg;
 
-	sprintf( port, "0" );
+	strcpy( port, "0" );
 
 	/* Format is <IP-A>[:<Port-A>];<IP-B>[:<Port-B>] where
 	 * A is for connections with the bitlbee client (DCC)
 	 * and B is for connections with IM peers.
 	 */
-	if( ftlisten ) {
+	if( ftlisten )
+	{
 		char *scolon = strchr( ftlisten, ';' );
 		char *colon;
 
-		if( scolon ) {
-			if( for_bitlbee_client ) {
+		if( scolon )
+		{
+			if( for_bitlbee_client )
+			{
 				*scolon = '\0';
-				sprintf( host, ftlisten );
+				strncpy( host, ftlisten, HOST_NAME_MAX );
 				*scolon = ';';
-			} else {
-				sprintf( host, scolon + 1 );
 			}
-		} else {
-			sprintf( host, ftlisten );
+			else
+			{
+				strncpy( host, scolon + 1, HOST_NAME_MAX );
+			}
+		}
+		else
+		{
+			strncpy( host, ftlisten, HOST_NAME_MAX );
 		}
 
-		if( ( colon = strchr( host, ':' ) ) ) {
+		if( ( colon = strchr( host, ':' ) ) )
+		{
 			*colon = '\0';
-			sprintf( port, colon + 1 );
+			strncpy( port, colon + 1, 5 );
 		}
-	} else {
+	}
+	else
+	{
 		ASSERTSOCKOP( gethostname( host, HOST_NAME_MAX + 1 ), "gethostname()" );
 	}
 
@@ -91,7 +91,8 @@ int ft_listen( struct sockaddr_storage *saddr_ptr, char *hostp, char *port, int
 	hints.ai_socktype = SOCK_STREAM;
 	hints.ai_flags = AI_NUMERICSERV;
 
-	if ( ( gret = getaddrinfo( host, port, &hints, &rp ) ) != 0 ) {
+	if ( ( gret = getaddrinfo( host, port, &hints, &rp ) ) != 0 )
+	{
 		sprintf( errmsg, "getaddrinfo() failed: %s", gai_strerror( gret ) );
 		return -1;
 	}
@@ -103,29 +104,31 @@ int ft_listen( struct sockaddr_storage *saddr_ptr, char *hostp, char *port, int
 	freeaddrinfo( rp );
 
 	ASSERTSOCKOP( fd = socket( saddr->ss_family, SOCK_STREAM, 0 ), "Opening socket" );
-
 	ASSERTSOCKOP( bind( fd, ( struct sockaddr *)saddr, saddrlen ), "Binding socket" );
-	
 	ASSERTSOCKOP( listen( fd, 1 ), "Making socket listen" );
 
 	if ( !inet_ntop( saddr->ss_family, saddr->ss_family == AF_INET ?
-			( void * )&( ( struct sockaddr_in * ) saddr )->sin_addr.s_addr : ( void * )&( ( struct sockaddr_in6 * ) saddr )->sin6_addr.s6_addr
-			, host, INET6_ADDRSTRLEN ) ) {
-		sprintf( errmsg, "inet_ntop failed on listening socket" );
+			( void * )&( ( struct sockaddr_in * ) saddr )->sin_addr.s_addr :
+			( void * )&( ( struct sockaddr_in6 * ) saddr )->sin6_addr.s6_addr,
+			host, HOST_NAME_MAX ) )
+	{
+		strcpy( errmsg, "inet_ntop failed on listening socket" );
 		return -1;
 	}
 
 	ASSERTSOCKOP( getsockname( fd, ( struct sockaddr *)saddr, &ssize ), "Getting socket name" );
 
 	if( saddr->ss_family == AF_INET )
-		sprintf( port, "%d", ntohs( ( ( struct sockaddr_in *) saddr )->sin_port ) );
+		g_snprintf( port, 6, "%d", ntohs( ( (struct sockaddr_in *) saddr )->sin_port ) );
 	else
-		sprintf( port, "%d", ntohs( ( ( struct sockaddr_in6 *) saddr )->sin6_port ) );
+		g_snprintf( port, 6, "%d", ntohs( ( (struct sockaddr_in6 *) saddr )->sin6_port ) );
 
 	if( saddr_ptr )
 		memcpy( saddr_ptr, saddr, saddrlen );
 
-	strcpy( hostp, host );
-
+	/* I hate static-length strings.. */
+	host[HOST_NAME_MAX] = '\0';
+	port[5] = '\0';
+	
 	return fd;
 }
diff --git a/lib/ftutil.h b/lib/ftutil.h
index 636fcbd0..c4a5b02b 100644
--- a/lib/ftutil.h
+++ b/lib/ftutil.h
@@ -25,4 +25,16 @@
 #define AI_NUMERICSERV 0x0400   /* Don't use name resolution.  */
 #endif
 
+/* Some ifdefs for ulibc and apparently also BSD (Thanks to Whoopie) */
+#ifndef HOST_NAME_MAX
+#include <sys/param.h>
+#ifdef MAXHOSTNAMELEN
+#define HOST_NAME_MAX MAXHOSTNAMELEN
+#else
+#define HOST_NAME_MAX 255
+#endif
+#endif
+
+/* This function should be used with care. host should be AT LEAST a
+   char[HOST_NAME_MAX+1] and port AT LEAST a char[6]. */
 int ft_listen( struct sockaddr_storage *saddr_ptr, char *host, char *port, int for_bitlbee_client, char **errptr );