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.2.2.2 and 1.2.2.3

version 1.2.2.2, 2012/04/15 21:44:33	version 1.2.2.3, 2012/04/24 08:06:09
Line 5 int	Line 5 int
srv_Socket(cfg_root_t * __restrict cfg)	srv_Socket(cfg_root_t * __restrict cfg)
{	{
int s = -1, n = 1;	int s = -1, n = 1;
struct hostent *host;
ait_val_t v;	ait_val_t v;
u_short port;	u_short port;
io_sockaddr_t sa;	io_sockaddr_t sa;
Line 16 srv_Socket(cfg_root_t * __restrict cfg)	Line 15 srv_Socket(cfg_root_t * __restrict cfg)
port = strtol(AIT_GET_STR(&v), NULL, 0);	port = strtol(AIT_GET_STR(&v), NULL, 0);
AIT_FREE_VAL(&v);	AIT_FREE_VAL(&v);
cfg_loadAttribute(cfg, "mqttd", "listen", &v, MQTT_HOST);	cfg_loadAttribute(cfg, "mqttd", "listen", &v, MQTT_HOST);
	if (!io_gethostbyname(AIT_GET_STR(&v), port, &sa)) {
host = gethostbyname(AIT_GET_STR(&v));	ioLIBERR(io);
AIT_FREE_VAL(&v);	AIT_FREE_VAL(&v);
if (!host) {
ioERROR(h_errno, "%s", hstrerror(h_errno));
return -1;	return -1;
}	} else
switch (host->h_addrtype) {	AIT_FREE_VAL(&v);
case AF_INET:
sa.sin.sin_len = sizeof(struct sockaddr_in);
sa.sin.sin_family = AF_INET;
sa.sin.sin_port = htons(port);
memcpy(&sa.sin.sin_addr, host->h_addr, sizeof sa.sin.sin_addr);
break;
case AF_INET6:
sa.sin6.sin6_len = sizeof(struct sockaddr_in6);
sa.sin6.sin6_family = AF_INET6;
sa.sin6.sin6_port = htons(port);
memcpy(&sa.sin6.sin6_addr, host->h_addr, sizeof sa.sin6.sin6_addr);
break;
default:
ioERROR(host->h_addrtype, "unsupported socket type");
return -1;
}

s = socket(sa.ss.ss_family, SOCK_STREAM, 0);	s = socket(sa.ss.ss_family, SOCK_STREAM, 0);
if (s == -1) {	if (s == -1) {
Line 51 srv_Socket(cfg_root_t * __restrict cfg)	Line 32 srv_Socket(cfg_root_t * __restrict cfg)
close(s);	close(s);
return -1;	return -1;
}	}
if (bind(s, (struct sockaddr*) &sa.ss, sa.ss.ss_len) == -1) {	if (bind(s, &sa.sa, sa.sa.sa_len) == -1) {
ioSYSERR(0);	ioSYSERR(0);
close(s);	close(s);
return -1;	return -1;

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

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