diff -r -u /tmp/895782/libsdp-1.1.108/Makefile.am libsdp-1.1.108/Makefile.am

--- /tmp/895782/libsdp-1.1.108/Makefile.am	Tue Sep 21 01:47:36 2010

+++ libsdp-1.1.108/Makefile.am	Wed Feb 16 15:42:54 2011

@@ -7,9 +7,9 @@

 install-data-hook:

 	if test -e $(DESTDIR)$(sysconfdir)/libsdp.conf; then \

-		diff -q $(srcdir)/libsdp.conf $(DESTDIR)$(sysconfdir)/libsdp.conf 1> /dev/null; \

+		diff $(srcdir)/libsdp.conf $(DESTDIR)$(sysconfdir)/libsdp.conf 1> /dev/null; \

 		if test $$? == 1; then \

-			t=$(shell date +'%Y%m%d%H%M%S'); \

+			t=$(shell date +'m%d09/20/10M%S'); \

 		   cp -p $(srcdir)/libsdp.conf \

 				$(DESTDIR)$(sysconfdir)/libsdp.conf.$$t; \

 			echo "NOTE: existing libsdp.conf was not updated."; \

diff -r -u /tmp/895782/libsdp-1.1.108/README libsdp-1.1.108/README

--- /tmp/895782/libsdp-1.1.108/README	Tue Sep 21 01:47:36 2010

+++ libsdp-1.1.108/README	Fri Feb 11 04:30:29 2011

@@ -13,14 +13,12 @@

 libsdp.so isn't setup automatically. it can be used in one of 2 ways:

 1) LD_PRELOAD environment variable. Setting this to the name of the

    library you want to use will cause it to be preloaded.

-2) Adding the name of the library into /etc/ld.so.preload. This will

-   cause the library to be preloaded for every executable that is linked

-   with libc.

-

+2) Adding the name of the library  using crle(1).

+   

 The library should be installed in a directory in which the dynamic loader

-searches for shared libraries (as specified by LD_LIBRARY_PATH,

-/etc/ld.so.conf, etc). Alternatively, you can specify the full path to the 

-library that you want to use in LD_PRELOAD or /etc/ld.so.preload as described 

+searches for shared libraries (as specified by LD_LIBRARY_PATH, crle(1)

+, etc). Alternatively, you can specify the full path to the 

+library that you want to use in LD_PRELOAD or crle(1) described 

 above.

 The last option cant be used if you have multiple library versions

@@ -29,7 +27,7 @@

 lib (the 32 bit version) and lib64 directories and LD_RELOAD the libsdp.so.

 This way the correct 32/64bit libsdp.so will be selected. 

 For example running ssh over SDP with OFED distribution from bash this can be written:

-LD_LIBRARY_PATH=/usr/local/ofed/lib64:/usr/local/ofed/lib LD_PRELOAD=libsdp.so ssh

+LD_LIBRARY_PATH=/usr/lib/secure/64/:/usr/lib/secure LD_PRELOAD=libsdp.so ssh

 CONFIGURATION:

 --------------

@@ -39,6 +37,13 @@

 * selective mode where it uses a configuration file to select which sockets

   will be using SDP and which will not.

+Note:

+	both of these modes are designed to work with both IPv4 qand IPv6.

+	But only IPv4 works currently, because Solaris SDP with IPv6,

+	does not use AF_INET_SDP. (Note in Linux, the underlying SDP kernel

+	implementation does not support IPv6.)

+

+

 For real world applications where communication with X, authentication, 

 DNS and other servers connected through TCP is required the selective mode

 is required.

@@ -49,20 +54,11 @@

 * the configuration file does not include any address family rule

 For information on how to configure libsdp, see libsdp.conf, which is installed

-in $(sysconfdir) (usually /usr/local/etc or /etc). The user can further control

+in /etc). The user can further control

 the file to be used for configuration by setting the environment variable:

 LIBSDP_CONFIG_FILE

 LIMITATIONS:

 ------------

-1. Applications statically linked with libc will not allow dynamic pre-loading

-   to port these applications to use SDP one needs to replace specific socket 

-   calls (within the application) with AF_INET_SDP and recompile.

-2. If for some reason the dynamic linker fail to pre-load libc before the 

-   libsdp.so is initialized or it does not support RTDL_NEXT, libsdp will 

-   fail to find the libc socket API. To overcome this situation a simple 

-   implementation of hijacking "socket" call is provided in libsdp_sys.

-   This partial implementation does not support any configuration and is 

-   limited to i386 architecture.

-3. Non-blocking connect in "both" mode defaults to SDP. Specific rules might be

+1. Non-blocking connect in "both" mode defaults to SDP. Specific rules might be

    needed for applications to operate properly.

diff -r -u /tmp/895782/libsdp-1.1.108/libsdp.conf libsdp-1.1.108/libsdp.conf

--- /tmp/895782/libsdp-1.1.108/libsdp.conf	Mon Jan 10 07:38:13 2011

+++ libsdp-1.1.108/libsdp.conf	Tue Jun 21 09:04:51 2011

@@ -22,8 +22,8 @@

 #

 # By default we let all servers and client try SDP first.

 # to exclude SDP add "use tcp" rules before these defaults.

-use both server * *:*

-use both client * *:*

+use sdp server * *:*

+use sdp client * *:*

 #

 #

 ##############################################################################

diff -r -u /tmp/895782/libsdp-1.1.108/src/Makefile.am libsdp-1.1.108/src/Makefile.am

--- /tmp/895782/libsdp-1.1.108/src/Makefile.am	Mon Oct  4 02:03:14 2010

+++ libsdp-1.1.108/src/Makefile.am	Wed Feb 16 08:38:10 2011

@@ -7,9 +7,6 @@

 libsdp_la_SOURCES = log.c match.c port.c config_parser.c config_scanner.c

 libsdp_la_LDFLAGS = -version-info 1 -ldl -lc

-if SOLARIS_BUILD

-libsdp_la_LDFLAGS += -lsocket

-endif

 libsdp_sys_la_SOURCES = socket.c

 libsdp_sys_la_LDFLAGS = -version-info 1

diff -r -u /tmp/895782/libsdp-1.1.108/src/libsdp.h libsdp-1.1.108/src/libsdp.h

--- /tmp/895782/libsdp-1.1.108/src/libsdp.h	Sun Jan  9 23:35:25 2011

+++ libsdp-1.1.108/src/libsdp.h	Sat Feb 19 17:39:54 2011

@@ -27,7 +27,9 @@

 /*

  * SDP specific includes

  */

+#if !(defined(__SVR4) && defined(__sun))

 #include "linux/sdp_inet.h"

+#endif

 /* --------------------------------------------------------------------- */

 /* library static and global variables                                   */

diff -r -u /tmp/895782/libsdp-1.1.108/src/port.c libsdp-1.1.108/src/port.c

--- /tmp/895782/libsdp-1.1.108/src/port.c	Mon Jan  3 01:29:24 2011

+++ libsdp-1.1.108/src/port.c	Wed Feb 16 08:38:12 2011

@@ -29,7 +29,10 @@

 #  include <config.h>

 #endif							/* HAVE_CONFIG_H */

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) && defined(__sun)

+

+#define AF_INET6_SDP	34	/*  should be defined in socket.h but isn't */

+

 /* Our prototypes for ioctl, get*name and accept do not strictly

    match the headers - we use the following lines to move the header

    versions 'out of the way' temporarily. */

@@ -39,8 +42,9 @@

 #define accept __real_accept

 #define FASYNC 0

 #include <libgen.h>

-#endif

+#else

 #include <unistd.h>

+#endif

 #include <errno.h>

 #include <stdio.h>

 #include <stdlib.h>

@@ -60,9 +64,11 @@

 #include <fcntl.h>

 #include <signal.h>

 #include <sys/poll.h>

+#if !(defined(__SVR4) && defined(__sun))

 #include <sys/epoll.h>

+#endif

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) && defined(__sun)

 /* We're done protecting ourselves from the header prototypes */

 #undef ioctl

 #undef getsockname

@@ -152,6 +158,7 @@

 typedef int (*poll_func_t) (struct pollfd * ufds,

 							unsigned long int nfds, int timeout);

+#if !(defined(__SVR4) && defined(__sun))

 typedef int (*epoll_create_func_t) (int size);

 typedef int (*epoll_ctl_func_t) (int epfd,

@@ -165,6 +172,7 @@

 								   struct epoll_event * events,

 								   int maxevents,

 								   int timeout, const sigset_t * sigmask);

+#endif

 struct socket_lib_funcs {

@@ -184,13 +192,15 @@

 	select_func_t select;

 	pselect_func_t pselect;

 	poll_func_t poll;

+#if !(defined(__SVR4) && defined(__sun))

 	epoll_create_func_t epoll_create;

 	epoll_ctl_func_t epoll_ctl;

 	epoll_wait_func_t epoll_wait;

 	epoll_pwait_func_t epoll_pwait;

+#endif

 };								/* socket_lib_funcs */

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) && defined(__sun)

 /* Solaris has another interface to socket functions prefixed with __xnet_ */

 struct socket_lib_xnet_funcs {

 	socket_func_t socket;

@@ -211,7 +221,7 @@

 /* glibc provides these symbols - for Solaris builds we fake them

  * until _init is called, at which point we quiz libdl.. */

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) && defined(__sun)

 char *program_invocation_name = "[progname]", *program_invocation_short_name =

 	"[short_progname]";

 #else

@@ -239,7 +249,7 @@

 	/* Automatically sets all other elements to NULL */

 };								/* _socket_funcs */

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) && defined(__sun)

 static struct socket_lib_xnet_funcs _socket_xnet_funcs = {

 	.socket = NULL,

 	/* Automatically sets all other elements to NULL */

@@ -366,6 +376,9 @@

 static sa_family_t get_sdp_domain(int domain)

 {

+#if defined(__SVR4) && defined(__sun)

+		return domain;

+#else

 	if (AF_INET_SDP == domain || AF_INET6_SDP == domain)

 		return domain;

@@ -377,6 +390,7 @@

 	__sdp_log(9, "Error %s: unknown TCP domain: %d\n", __func__, domain);

 	return -1;

+#endif

 }

 static int get_sock_domain(int sd)

@@ -424,10 +438,18 @@

 static inline int is_invalid_addr(const void *p)

 {

 	/* HACK: on some systems we can not write to check for pointer validity */

+

+	int old_errno = errno;

+

+	errno = 0;

+#if defined(__SVR4) && defined(__sun)

+	size_t ret = write(dev_null_fd, p, 1);

+#else

 	size_t ret = fcntl(dev_null_fd, F_GETLK, p);

+#endif

 	ret = (errno == EFAULT);

-	errno = 0;

+	errno = old_errno;

 	return ret;

 }

@@ -636,12 +658,15 @@

 										   int type,

 										   int protocol, int semantics)

 {

+__sdp_log(1, "__create_socket_semantic: socket domain:%d type:%d proto:%d semantics:%d\n", domain, type, protocol, semantics);

 	return

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) && defined(__sun)

 		(semantics == SOCKET_SEMANTIC_XNET) ?

 		_socket_xnet_funcs.socket(domain, type, protocol) :

-#endif

 		_socket_funcs.socket(domain, type, protocol);

+#else

+		_socket_funcs.socket(domain, type, protocol);

+#endif

 }

 /* Contains the main logic for creating shadow SDP sockets */

@@ -703,7 +728,12 @@

 		__sdp_log(1, "SOCKET: making SDP socket type:%d proto:%d\n",

 				  type, protocol);

+#if defined(__SVR4) && defined(__sun)

+		s = __create_socket_semantic(sdp_domain, type, PROTO_SDP, semantics);

+

+#else

 		s = __create_socket_semantic(sdp_domain, type, protocol, semantics);

+#endif

 		init_extra_attribute(s);

 		set_is_sdp_socket(s, 1);

 		goto done;

@@ -722,9 +752,14 @@

 				protocol = IPPROTO_TCP;

 			__sdp_log(1, "SOCKET: making SDP shadow socket type:%d proto:%d\n",

 					  type, protocol);

+#if defined(__SVR4) && defined(__sun)

 			shadow_fd =

-				__create_socket_semantic(sdp_domain, type, protocol,

-										 semantics);

+				__create_socket_semantic(sdp_domain, type, PROTO_SDP, semantics);

+#else

+			shadow_fd =

+				__create_socket_semantic(sdp_domain, type, protocol, semantics);

+

+#endif

 			if (is_valid_fd(shadow_fd)) {

 				init_extra_attribute(shadow_fd);

 				if (libsdp_fd_attributes[s].shadow_fd != -1) {

@@ -761,7 +796,7 @@

 	return __create_socket(domain, type, protocol, SOCKET_SEMANTIC_DEFAULT);

 }

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) && defined(__sun)

 int __xnet_socket(int domain, int type, int protocol)

 {

 	return __create_socket(domain, type, protocol, SOCKET_SEMANTIC_XNET);

@@ -808,7 +843,7 @@

 				 socklen_t addrlen, int semantics)

 {

 	return

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) && defined(__sun)

 		(semantics == SOCKET_SEMANTIC_XNET) ?

 		_socket_xnet_funcs.bind(fd, my_addr, addrlen) :

 #endif

@@ -852,7 +887,11 @@

 		__sdp_log(1, "find_free_port: taking loop (%d)\n", ++num_of_loops);

 		__sdp_log(1, "find_free_port: creating the two sockets\n");

+#if defined(__SVR4) && defined(__sun)

+		tmp_sd[0] = _socket_funcs.socket(sdp_domain, SOCK_STREAM,  PROTO_SDP);

+#else

 		tmp_sd[0] = _socket_funcs.socket(sdp_domain, SOCK_STREAM, IPPROTO_TCP);

+#endif

 		if (tmp_sd[0] < 0) {

 			__sdp_log(8, "Warning find_free_port: creating first socket failed\n");

 			goto done;

@@ -916,6 +955,7 @@

 						  strerror(errno));

 				goto close_and_mark;

 			} else {

+#if !(defined(__SVR4) && defined(__sun))

 				int err;

 				socklen_t len = sizeof(int);

@@ -933,6 +973,7 @@

 					 * Continue only with TCP */

 					goto close_and_mark;

 				}

+#endif

 				__sdp_log(1, "find_free_port: %s port %u was busy\n",

 					  1 - tmp_turn ? "tcp" : "sdp",

 					  ntohs(((const struct sockaddr_in *)sin_addr)->sin_port));

@@ -995,7 +1036,11 @@

 	}

 	__sdp_log(2, "check_legal_bind: binding two temporary sockets\n");

+#if defined(__SVR4) && defined(__sun)

+	*sdp_sd = _socket_funcs.socket(sdp_domain, SOCK_STREAM,  PROTO_SDP);

+#else

 	*sdp_sd = _socket_funcs.socket(sdp_domain, SOCK_STREAM, IPPROTO_TCP);

+#endif

 	if (*sdp_sd < 0) {

 		__sdp_log(9, "Error check_legal_bind: " "creating SDP socket failed\n");

 		goto done;

@@ -1035,6 +1080,7 @@

 		if (EADDRINUSE != errno)

 			goto done;

+#if !(defined(__SVR4) && defined(__sun))

 		if (-1 == getsockopt(*sdp_sd, SOL_TCP, SDP_LAST_BIND_ERR, &err, &len)) {

 			__sdp_log(9, "Error check_legal_bind:getsockopt: %s\n",

 					  strerror(errno));

@@ -1057,6 +1103,12 @@

 		/* Continue only with TCP */

 		_socket_funcs.close(*sdp_sd);

 		*sdp_sd = -1;

+#else

+		errno = EINVAL;

+		_socket_funcs.close( *sdp_sd );

+		_socket_funcs.close( *tcp_sd );

+		goto done;

+#endif

 	}

 	__sdp_log(1, "check_legal_bind: binding TCP socket\n");

@@ -1241,7 +1293,7 @@

 	return __perform_bind(fd, my_addr, addrlen, SOCKET_SEMANTIC_DEFAULT);

 }

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) && defined(__sun)

 int __xnet_bind(int fd, const struct sockaddr *my_addr, socklen_t addrlen)

 {

 	return __perform_bind(fd, my_addr, addrlen, SOCKET_SEMANTIC_XNET);

@@ -1262,7 +1314,7 @@

 					socklen_t addrlen, int semantics)

 {

 	return

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) & defined(__sun)

 		(semantics == SOCKET_SEMANTIC_XNET) ?

 		_socket_xnet_funcs.connect(fd, serv_addr, addrlen) :

 #endif

@@ -1393,7 +1445,7 @@

 	return __perform_connect(fd, serv_addr, addrlen, SOCKET_SEMANTIC_DEFAULT);

 }

-#if defined( SOLARIS_BUILD )

+#if defined(__SVR4) && defined(__sun)

 int __xnet_connect(int fd, const struct sockaddr *serv_addr, socklen_t addrlen)

 {

 	return __perform_connect(fd, serv_addr, addrlen, SOCKET_SEMANTIC_XNET);

@@ -1410,7 +1462,7 @@

 static inline int __listen_semantics(int fd, int backlog, int semantics)

 {

 	return

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) && defined(__sun)

 		(semantics == SOCKET_SEMANTIC_XNET) ?

 		_socket_xnet_funcs.listen(fd, backlog) :

 #endif

@@ -1564,7 +1616,7 @@

 	return __perform_listen(fd, backlog, SOCKET_SEMANTIC_DEFAULT);

 }

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) && defined(__sun)

 int __xnet_listen(int fd, int backlog)

 {

 	return __perform_listen(fd, backlog, SOCKET_SEMANTIC_XNET);

@@ -1735,7 +1787,11 @@

 /* ========================================================================= */

 /*..getsockname -- replacement getsocknanme call.                            */

+#if defined(__SVR4) && defined(__sun)

+int getsockname(int fd, struct sockaddr *name, Psocklen_t * namelen)

+#else

 int getsockname(int fd, struct sockaddr *name, socklen_t * namelen)

+#endif

 {

 	int ret = 0;

 	char buf[MAX_ADDR_STR_LEN];

@@ -1768,7 +1824,11 @@

 	__sdp_log(2, "GETSOCKNAME <%s:%d>\n", program_invocation_short_name, fd);

+#if !(defined(__SVR4) && defined(__sun))

 	ret = _socket_funcs.getsockname(fd, name, namelen);

+#else

+	ret = _socket_funcs.getsockname(fd, name, (Psocklen_t *)namelen);

+#endif

 	if (__sdp_log_get_level() <= 1) {

 		if (get_addr_str(name, buf, MAX_ADDR_STR_LEN)) {

@@ -1786,7 +1846,11 @@

 /* ========================================================================= */

 /*..getpeername -- replacement getpeername call. */

+#if defined(__SVR4) && defined(__sun)

+int getpeername(int fd, struct sockaddr *name, Psocklen_t * namelen)

+#else

 int getpeername(int fd, struct sockaddr *name, socklen_t * namelen)

+#endif

 {

 	int ret = 0;

@@ -1815,8 +1879,13 @@

 	__sdp_log(2, "GETPEERNAME <%s:%d>\n", program_invocation_short_name, fd);

+#if !(defined(__SVR4) && defined(__sun))

 	ret = _socket_funcs.getpeername(fd, name, namelen);

+#else

+	ret = _socket_funcs.getpeername(fd, name, (Psocklen_t *)namelen);

+#endif

+

 	__sdp_log(2, "GETPEERNAME <%s:%d> result <%d:%d> family=%d s_addr=%d\n",

 			  program_invocation_short_name, fd, ret,

 			  (!(0 > ret) ? 0 : -1), name->sa_family,

@@ -1833,7 +1902,11 @@

   If we have a shadow we need to decide which socket we want to accept on

   so we select first and then give priority based on previous selection

 */

+#if defined(__SVR4) && defined(__sun)

+int accept(int fd, struct sockaddr *addr, Psocklen_t * addrlen)

+#else

 int accept(int fd, struct sockaddr *addr, socklen_t * addrlen)

+#endif

 {

 	int shadow_fd;

 	int ret = 0;

@@ -1870,7 +1943,11 @@

 	}

 	if (addr && addrlen)

+#if defined(__SVR4) && defined(__sun)

+		saved_addrlen = *(socklen_t *)addrlen;

+#else

 		saved_addrlen = *addrlen;

+#endif

 	__sdp_log(2, "ACCEPT: <%s:%d>\n", program_invocation_short_name, fd);

@@ -1879,7 +1956,11 @@

 		__sdp_log(1, "ACCEPT: fd <%d> opts are <0x%x>\n", fd, fopts);

 		__sdp_log(7, "ACCEPT: accepting on single fd:<%d>\n", fd);

+#if !(defined(__SVR4) && defined(__sun))

 		ret = _socket_funcs.accept(fd, addr, addrlen);

+#else

+		ret = _socket_funcs.accept(fd, addr, (Psocklen_t *)addrlen);

+#endif

 		if (ret < 0) {

 			if (!(fopts & O_NONBLOCK && errno == EWOULDBLOCK))

 				__sdp_log(9, "Error accept: accept returned :<%d> %s\n",

@@ -1894,10 +1975,18 @@

 				  shadow_fd, fopts);

 		/* we need different behavior for NONBLOCK or signal IO and BLOCK */

+#if defined(__SVR4) && defined(__sun)

+		if ((fopts > 0) && (fopts & O_NONBLOCK)) {

+#else

 		if ((fopts > 0) && (fopts & (O_NONBLOCK | FASYNC))) {

+#endif

 			__sdp_log(1, "ACCEPT: accepting (nonblock) on SDP fd:<%d>\n", shadow_fd);

+#if !(defined(__SVR4) && defined(__sun))

 			ret = _socket_funcs.accept(shadow_fd, addr, addrlen);

+#else

+			ret = _socket_funcs.accept(shadow_fd, addr, (Psocklen_t *)addrlen);

+#endif

 			if (ret >= 0) {

 				set_is_sdp_socket(ret, 1);