mqtt/src/utils.c - diff

Return to utils.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/utils.c between versions 1.1.2.2 and 1.2.2.2

version 1.1.2.2, 2011/11/30 00:12:30	version 1.2.2.2, 2012/04/15 21:44:33
Line 2	Line 2


int	int
srv_Socket(sl_config * __restrict cfg)	srv_Socket(cfg_root_t * __restrict cfg)
{	{
int s = -1, n = 1;	int s = -1, n = 1;
struct hostent *host;	struct hostent *host;
char szStr[STRSIZ];	ait_val_t v;
u_short port;	u_short port;
struct sockaddr_storage ss;	io_sockaddr_t sa;
struct sockaddr_in sin = (struct sockaddr_in) &ss;
struct sockaddr_in6 sin6 = (struct sockaddr_in6) &ss;

cfg_LoadAttribute(cfg, CFG("mqttd"), CFG("port"), CFG(szStr), sizeof szStr, MQTT_PORT);	ioTRACE(2);
port = strtol(szStr, NULL, 0);
cfg_LoadAttribute(cfg, CFG("mqttd"), CFG("listen"), CFG(szStr), sizeof szStr, MQTT_HOST);

host = gethostbyname(szStr);	cfg_loadAttribute(cfg, "mqttd", "port", &v, MQTT_PORT);
	port = strtol(AIT_GET_STR(&v), NULL, 0);
	AIT_FREE_VAL(&v);
	cfg_loadAttribute(cfg, "mqttd", "listen", &v, MQTT_HOST);

	host = gethostbyname(AIT_GET_STR(&v));
	AIT_FREE_VAL(&v);
if (!host) {	if (!host) {
printf("Error:: resolver #%d - %s\n", h_errno, hstrerror(h_errno));	ioERROR(h_errno, "%s", hstrerror(h_errno));
return -1;	return -1;
}	}
switch (host->h_addrtype) {	switch (host->h_addrtype) {
case AF_INET:	case AF_INET:
sin->sin_len = sizeof(struct sockaddr_in);	sa.sin.sin_len = sizeof(struct sockaddr_in);
sin->sin_family = AF_INET;	sa.sin.sin_family = AF_INET;
sin->sin_port = htons(port);	sa.sin.sin_port = htons(port);
memcpy(&sin->sin_addr, host->h_addr, sizeof sin->sin_addr);	memcpy(&sa.sin.sin_addr, host->h_addr, sizeof sa.sin.sin_addr);
break;	break;
case AF_INET6:	case AF_INET6:
sin6->sin6_len = sizeof(struct sockaddr_in6);	sa.sin6.sin6_len = sizeof(struct sockaddr_in6);
sin6->sin6_family = AF_INET6;	sa.sin6.sin6_family = AF_INET6;
sin6->sin6_port = htons(port);	sa.sin6.sin6_port = htons(port);
memcpy(&sin6->sin6_addr, host->h_addr, sizeof sin6->sin6_addr);	memcpy(&sa.sin6.sin6_addr, host->h_addr, sizeof sa.sin6.sin6_addr);
break;	break;
default:	default:
printf("Error:: unsupported socket type %d\n", host->h_addrtype);	ioERROR(host->h_addrtype, "unsupported socket type");
return -1;	return -1;
}	}

s = socket(ss.ss_family, SOCK_STREAM, IPPROTO_TCP);	s = socket(sa.ss.ss_family, SOCK_STREAM, 0);
if (s == -1) {	if (s == -1) {
printf("Error:: socket() #%d - %s\n", errno, strerror(errno));	ioSYSERR(0);
return -1;	return -1;
}	}
if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) {	if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) {
printf("Error:: setsockopt(SO_REUSEADDR) #%d - %s\n", errno, strerror(errno));	ioSYSERR(0);
close(s);	close(s);
return -1;	return -1;
}	}
if (bind(s, (struct sockaddr*) &ss, ss.ss_len) == -1) {	if (bind(s, (struct sockaddr*) &sa.ss, sa.ss.ss_len) == -1) {
printf("Error:: bind() #%d - %s\n", errno, strerror(errno));	ioSYSERR(0);
close(s);	close(s);
return -1;	return -1;
}	}
Line 61 srv_Socket(sl_config * __restrict cfg)	Line 63 srv_Socket(sl_config * __restrict cfg)
int	int
srv_Close(int s)	srv_Close(int s)
{	{
shutdown(s, SHUT_RDWR);	ioTRACE(2);

	if (s > STDERR_FILENO)
	shutdown(s, SHUT_RDWR);

return close(s);	return close(s);
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.2.2
changed lines
	Added in v.1.2.2.2