time_t starttime;
ber_socket_t dtblsize;
-typedef union slap_sockaddr {
- struct sockaddr sa_addr;
- struct sockaddr_in sa_in_addr;
-#ifdef LDAP_PF_INET6
- struct sockaddr_in6 sa_in6_addr;
-#endif
-#ifdef LDAP_PF_LOCAL
- struct sockaddr_un sa_un_addr;
-#endif
-} Sockaddr;
-
typedef struct slap_listener {
char* sl_url;
char* sl_name;
#ifdef HAVE_TLS
int sl_is_tls;
+#endif
+#ifdef LDAP_CONNECTIONLESS
+ int sl_is_udp; /* UDP listener is also data port */
#endif
ber_socket_t sl_sd;
Sockaddr sl_sa;
slapd_srvurls = str2charray( urls, " " );
- if( slapd_srv_urls == NULL ) return;
+ if( slapd_srvurls == NULL ) return;
/* find and expand INADDR_ANY URLs */
for( i=0; slapd_srvurls[i] != NULL; i++ ) {
}
void slapd_slp_deinit() {
- if( slapd_srv_urls == NULL ) return;
+ if( slapd_srvurls == NULL ) return;
charray_free( slapd_srvurls );
slapd_srvurls = NULL;
struct sockaddr ***sal)
{
struct sockaddr **sap;
-#ifdef HAVE_GETADDRINFO
- struct addrinfo hints, *res, *sai;
- int n, err;
- memset( &hints, '\0', sizeof(hints) );
- hints.ai_flags = AI_PASSIVE;
- hints.ai_socktype = SOCK_STREAM;
-# ifdef LDAP_PF_LOCAL
+#ifdef LDAP_PF_LOCAL
if ( port == 0 ) {
- hints.ai_family = AF_LOCAL;
- /* host specifies a service in this case */
- if (err = getaddrinfo(NULL, host, &hints, &res)) {
+ *sal = ch_malloc(2 * sizeof(void *));
+ if (*sal == NULL) {
+ return -1;
+ }
+
+ sap = *sal;
+ *sap = ch_malloc(sizeof(struct sockaddr_un));
+ if (*sap == NULL)
+ goto errexit;
+ sap[1] = NULL;
+
+ if ( strlen(host) >
+ (sizeof(((struct sockaddr_un *)*sap)->sun_path) - 1) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "slap_get_listener_addresses: getaddrinfo failed: %s\n",
- AC_GAI_STRERROR(err) ));
+ "slap_get_listener_addresses: domain socket path (%s) too long in URL\n",
+ host ));
#else
- Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
- AC_GAI_STRERROR(err), 0, 0);
+ Debug( LDAP_DEBUG_ANY,
+ "daemon: domain socket path (%s) too long in URL",
+ host, 0, 0);
#endif
- return -1;
+ goto errexit;
}
+
+ (void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
+ (*sap)->sa_family = AF_LOCAL;
+ strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
} else
-# endif
+#endif
{
+#ifdef HAVE_GETADDRINFO
+ struct addrinfo hints, *res, *sai;
+ int n, err;
char serv[7];
- snprintf(serv, sizeof serv, "%d", port);
+ memset( &hints, '\0', sizeof(hints) );
+ hints.ai_flags = AI_PASSIVE;
+ hints.ai_socktype = SOCK_STREAM;
hints.ai_family = AF_UNSPEC;
+ snprintf(serv, sizeof serv, "%d", port);
+
if (err = getaddrinfo(host, serv, &hints, &res)) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
#endif
return -1;
}
- }
- sai = res;
- for (n=2; (sai = sai->ai_next) != NULL; n++) {
- /* EMPTY */ ;
- }
- *sal = ch_malloc(n * sizeof(*sal));
- if (*sal == NULL) {
- return -1;
- }
+ sai = res;
+ for (n=2; (sai = sai->ai_next) != NULL; n++) {
+ /* EMPTY */ ;
+ }
+ *sal = ch_malloc(n * sizeof(void *));
+ if (*sal == NULL) {
+ return -1;
+ }
- sai = res;
- sap = *sal;
- do {
- switch (sai->ai_family) {
-# ifdef LDAP_PF_LOCAL
- case AF_LOCAL: {
- *sap = ch_malloc(sizeof(struct sockaddr_un));
- if (*sap == NULL) {
+ sap = *sal;
+
+ for ( sai=res; sai; sai=sai->ai_next ) {
+ if( sai->ai_addr == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
+ "slap_get_listener_addresses: "
+ "getaddrinfo ai_addr is NULL?\n" ));
+#else
+ Debug( LDAP_DEBUG_ANY, "slap_get_listener_addresses: "
+ "getaddrinfo ai_addr is NULL?\n", 0, 0, 0 );
+#endif
freeaddrinfo(res);
goto errexit;
}
- *(struct sockaddr_un *)*sap =
- *((struct sockaddr_un *)sai->ai_addr);
- } break;
-# endif
+
+ switch (sai->ai_family) {
# ifdef LDAP_PF_INET6
- case AF_INET6: {
- *sap = ch_malloc(sizeof(struct sockaddr_in6));
- if (*sap == NULL) {
- freeaddrinfo(res);
- goto errexit;
- }
- *(struct sockaddr_in6 *)*sap =
- *((struct sockaddr_in6 *)sai->ai_addr);
- } break;
+ case AF_INET6:
+ *sap = ch_malloc(sizeof(struct sockaddr_in6));
+ if (*sap == NULL) {
+ freeaddrinfo(res);
+ goto errexit;
+ }
+ *(struct sockaddr_in6 *)*sap =
+ *((struct sockaddr_in6 *)sai->ai_addr);
+ break;
# endif
- case AF_INET: {
- *sap = ch_malloc(sizeof(struct sockaddr_in));
- if (*sap == NULL) {
- freeaddrinfo(res);
- goto errexit;
+ case AF_INET:
+ *sap = ch_malloc(sizeof(struct sockaddr_in));
+ if (*sap == NULL) {
+ freeaddrinfo(res);
+ goto errexit;
+ }
+ *(struct sockaddr_in *)*sap =
+ *((struct sockaddr_in *)sai->ai_addr);
+ break;
+ default:
+ *sap = NULL;
+ break;
+ }
+ if (*sap != NULL) {
+ (*sap)->sa_family = sai->ai_family;
+ sap++;
}
- *(struct sockaddr_in *)*sap =
- *((struct sockaddr_in *)sai->ai_addr);
- } break;
- default:
- *sap = NULL;
- break;
- }
- if (*sap != NULL) {
- (*sap)->sa_family = sai->ai_family;
- sap++;
}
- } while ((sai = sai->ai_next) != NULL);
-
- freeaddrinfo(res);
+ *sap = NULL;
+ freeaddrinfo(res);
#else
-# ifdef LDAP_PF_LOCAL
- if ( port == 0 ) {
- *sal = ch_malloc(2 * sizeof(*sal));
- if (*sal == NULL) {
- return -1;
- }
- sap = *sal;
- *sap = ch_malloc(sizeof(struct sockaddr_un));
- if (*sap == NULL)
- goto errexit;
- (void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
- (*sap)->sa_family = AF_LOCAL;
- if ( strlen(host) >
- (sizeof(((struct sockaddr_un *)*sal)->sun_path) - 1) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "slap_get_listener_addresses: domain socket path (%s) too long in URL\n",
- host ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "daemon: domain socket path (%s) too long in URL",
- host, 0, 0);
-#endif
- goto errexit;
- }
- strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
- } else
-# endif
- {
struct in_addr in;
if ( host == NULL ) {
AC_MEMCPY( &in, he->h_addr, sizeof( in ) );
}
- *sal = ch_malloc(2 * sizeof(*sal));
+ *sal = ch_malloc(2 * sizeof(void *));
if (*sal == NULL) {
return -1;
}
if (*sap == NULL) {
goto errexit;
}
+ sap[1] = NULL;
(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_in) );
(*sap)->sa_family = AF_INET;
((struct sockaddr_in *)*sap)->sin_port = htons(port);
((struct sockaddr_in *)*sap)->sin_addr = in;
- }
- sap++;
#endif
+ }
- *sap = NULL;
return 0;
errexit:
unsigned short port;
int err, addrlen;
struct sockaddr **sal, **psal;
+ int socktype = SOCK_STREAM; /* default to COTS */
rc = ldap_url_parse( url, &lud );
port = (unsigned short) lud->lud_port;
- if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
+ tmp = ldap_pvt_url_scheme2proto(lud->lud_scheme);
+ if ( tmp == LDAP_PROTO_IPC ) {
#ifdef LDAP_PF_LOCAL
if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
err = slap_get_listener_addresses(LDAPI_SOCK, 0, &sal);
return NULL;
#endif
} else {
+#ifdef LDAP_CONNECTIONLESS
+ l.sl_is_udp = ( tmp == LDAP_PROTO_UDP );
+#endif
if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
|| strcmp(lud->lud_host, "*") == 0 )
{
sal++;
continue;
}
- l.sl_sd = socket( (*sal)->sa_family, SOCK_STREAM, 0);
+#ifdef LDAP_CONNECTIONLESS
+ if (l.sl_is_udp)
+ socktype = SOCK_DGRAM;
+#endif
+ l.sl_sd = socket( (*sal)->sa_family, socktype, 0);
if ( l.sl_sd == AC_SOCKET_INVALID ) {
int err = sock_errno();
#ifdef NEW_LOGGING
case AF_INET: {
char *s;
-#if defined( HAVE_GETADDRINFO ) && defined( INET_NTOP )
+#if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
char addr[INET_ADDRSTRLEN];
inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr,
addr, sizeof(addr) );
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
continue;
+#ifdef LDAP_CONNECTIONLESS
+ /* Since this is connectionless, the data port is the
+ * listening port. The listen() and accept() calls
+ * are unnecessary.
+ */
+ if ( slap_listeners[l]->sl_is_udp )
+ {
+ slapd_add( slap_listeners[l]->sl_sd );
+ continue;
+ }
+#endif
if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
int err = sock_errno();
ber_socket_t nfds;
#define SLAPD_EBADF_LIMIT 16
int ebadf = 0;
+#if defined( EMFILE ) || defined( ENFILE )
+ int emfile = 0;
+#endif
#define SLAPD_IDLE_CHECK_LIMIT 4
time_t now = slap_get_time();
Sockaddr from;
#if defined(SLAPD_RLOOKUPS)
- struct hostent *hp;
+ struct hostent *hp;
#endif
struct timeval zero;
struct timeval *tvp;
- if( global_idletimeout > 0 && difftime(
- last_idle_check+global_idletimeout/SLAPD_IDLE_CHECK_LIMIT,
- now ) < 0 )
+ if(
+#if defined( EMFILE ) || defined( ENFILE )
+ emfile ||
+#endif
+ ( global_idletimeout > 0 && difftime(
+ last_idle_check+global_idletimeout/SLAPD_IDLE_CHECK_LIMIT,
+ now ) < 0 ))
{
connections_timeout_idle(now);
}
Debug( LDAP_DEBUG_CONNS, "daemon: select timeout - yielding\n",
0, 0, 0 );
#endif
- ldap_pvt_thread_yield();
+ ldap_pvt_thread_yield();
continue;
default: /* something happened - deal with it */
if ( !FD_ISSET( slap_listeners[l]->sl_sd, &readfds ) )
continue;
+#ifdef LDAP_CONNECTIONLESS
+ if ( slap_listeners[l]->sl_is_udp )
+ {
+ /* The first time we receive a query, we set this
+ * up as a "connection". It remains open for the life
+ * of the slapd.
+ */
+ if ( slap_listeners[l]->sl_is_udp < 2 )
+ {
+ id = connection_init(
+ slap_listeners[l]->sl_sd,
+ slap_listeners[l]->sl_url, "", "",
+ slap_listeners[l]->sl_name,
+ 2, ssf, authid );
+ slap_listeners[l]->sl_is_udp++;
+ }
+ continue;
+ }
+#endif
+
s = accept( slap_listeners[l]->sl_sd,
(struct sockaddr *) &from, &len );
if ( s == AC_SOCKET_INVALID ) {
int err = sock_errno();
+
+ ldap_pvt_thread_yield();
+
+#if defined( EMFILE ) || defined( ENFILE )
+#ifdef EMFILE
+ if( err == EMFILE ) {
+ emfile++;
+ } else
+#endif
+#ifdef ENFILE
+ if( err == ENFILE ) {
+ emfile++;
+ }
+#endif
+ /* prevent busy loop */
+# ifdef HAVE_USLEEP
+ if( emfile % 4 == 3 ) usleep( 250 );
+# else
+ if( emfile % 8 == 7 ) sleep( 1 );
+# endif
+ else continue;
+#endif
+
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "slapd_daemon_task: accept(%ld) failed errno=%d (%s)\n",
- (long)slap_listeners[l]->sl_sd, err, sock_errstr(err) ));
+ "slapd_daemon_task: accept(%ld) failed errno=%d (%s)\n",
+ (long)slap_listeners[l]->sl_sd, err, sock_errstr(err) ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: accept(%ld) failed errno=%d (%s)\n",
(long) slap_listeners[l]->sl_sd, err,
sock_errstr(err) );
#endif
+
continue;
}
+ emfile = 0;
#ifndef HAVE_WINSOCK
/* make sure descriptor number isn't too great */
if ( s >= dtblsize ) {
-#ifdef NEW_LGGING
+#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon_task: %ld beyond descriptor table size %ld\n",
(long)s, (long)dtblsize ));
(long) s, (long) dtblsize, 0 );
#endif
slapd_close(s);
+ ldap_pvt_thread_yield();
continue;
}
#endif
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( i == slap_listeners[l]->sl_sd ) {
+#ifdef LDAP_CONNECTIONLESS
+ /* The listener is the data port. Don't
+ * skip it.
+ */
+ if (slap_listeners[l]->sl_is_udp)
+ continue;
+#endif
is_listener = 1;
break;
}
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( i == slap_listeners[l]->sl_sd ) {
+#ifdef LDAP_CONNECTIONLESS
+ if (slap_listeners[l]->sl_is_udp)
+ continue;
+#endif
is_listener = 1;
break;
}
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( rd == slap_listeners[l]->sl_sd ) {
+#ifdef LDAP_CONNECTIONLESS
+ if (slap_listeners[l]->sl_is_udp)
+ continue;
+#endif
is_listener = 1;
break;
}
#endif
return rc;
}
-
- /* wait for the listener thread to complete */
- ldap_pvt_thread_join( listener_tid, (void *) NULL );
+
+ /* wait for the listener thread to complete */
+ ldap_pvt_thread_join( listener_tid, (void *) NULL );
}
#else
/* experimental code */