embedaddon/istgt/src/istgt_sock.c - diff

Return to istgt_sock.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / istgt / src

Diff for /embedaddon/istgt/src/istgt_sock.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/10/09 09:13:23	version 1.1.1.3, 2013/07/21 23:49:22
Line 41	Line 41
#include <netinet/tcp.h>	#include <netinet/tcp.h>

#include "istgt.h"	#include "istgt.h"
	#include "istgt_log.h"
#include "istgt_sock.h"	#include "istgt_sock.h"
#include "istgt_misc.h"	#include "istgt_misc.h"

Line 70 istgt_getaddr(int sock, char saddr, int slen, char c	Line 71 istgt_getaddr(int sock, char saddr, int slen, char c
salen = sizeof sa;	salen = sizeof sa;
rc = getsockname(sock, (struct sockaddr *) &sa, &salen);	rc = getsockname(sock, (struct sockaddr *) &sa, &salen);
if (rc != 0) {	if (rc != 0) {
	ISTGT_ERRLOG("getsockname() failed (errno=%d)\n", errno);
return -1;	return -1;
}	}
rc = getnameinfo((struct sockaddr *) &sa, salen,	rc = getnameinfo((struct sockaddr *) &sa, salen,
saddr, slen, NULL, 0, NI_NUMERICHOST);	saddr, slen, NULL, 0, NI_NUMERICHOST);
if (rc != 0) {	if (rc != 0) {
	ISTGT_ERRLOG("getnameinfo() failed (errno=%d)\n", errno);
return -1;	return -1;
}	}

Line 82 istgt_getaddr(int sock, char saddr, int slen, char c	Line 85 istgt_getaddr(int sock, char saddr, int slen, char c
salen = sizeof sa;	salen = sizeof sa;
rc = getpeername(sock, (struct sockaddr *) &sa, &salen);	rc = getpeername(sock, (struct sockaddr *) &sa, &salen);
if (rc != 0) {	if (rc != 0) {
	ISTGT_ERRLOG("getpeername() failed (errno=%d)\n", errno);
return -1;	return -1;
}	}
rc = getnameinfo((struct sockaddr *) &sa, salen,	rc = getnameinfo((struct sockaddr *) &sa, salen,
caddr, clen, NULL, 0, NI_NUMERICHOST);	caddr, clen, NULL, 0, NI_NUMERICHOST);
if (rc != 0) {	if (rc != 0) {
	ISTGT_ERRLOG("getnameinfo() failed (errno=%d)\n", errno);
return -1;	return -1;
}	}

Line 131 istgt_listen(const char *ip, int port)	Line 136 istgt_listen(const char *ip, int port)
hints.ai_flags \|= AI_NUMERICHOST;	hints.ai_flags \|= AI_NUMERICHOST;
rc = getaddrinfo(ip, portnum, &hints, &res0);	rc = getaddrinfo(ip, portnum, &hints, &res0);
if (rc != 0) {	if (rc != 0) {
	ISTGT_ERRLOG("getaddrinfo() failed (errno=%d)\n", errno);
return -1;	return -1;
}	}

Line 219 istgt_connect(const char *host, int port)	Line 225 istgt_connect(const char *host, int port)
hints.ai_flags = AI_NUMERICSERV;	hints.ai_flags = AI_NUMERICSERV;
rc = getaddrinfo(host, portnum, &hints, &res0);	rc = getaddrinfo(host, portnum, &hints, &res0);
if (rc != 0) {	if (rc != 0) {
	ISTGT_ERRLOG("getaddrinfo() failed (errno=%d)\n", errno);
return -1;	return -1;
}	}

Line 285 istgt_set_sendtimeout(int s, int msec)	Line 292 istgt_set_sendtimeout(int s, int msec)
tv.tv_sec = msec / 1000;	tv.tv_sec = msec / 1000;
tv.tv_usec = (msec % 1000) * 1000;	tv.tv_usec = (msec % 1000) * 1000;
rc = setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof tv);	rc = setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof tv);
	if (rc != 0)
	return -1;
	return 0;
	}

	int
	istgt_set_recvlowat(int s, int nbytes)
	{
	int val;
	int rc;

	val = nbytes;
	rc = setsockopt(s, SOL_SOCKET, SO_RCVLOWAT, &val, sizeof val);
if (rc != 0)	if (rc != 0)
return -1;	return -1;
return 0;	return 0;

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

Removed from v.1.1.1.2
changed lines
	Added in v.1.1.1.3