Add error handling to BDB_INDEX code

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 7edf78e5db47ab0ca7a550cab9e937a618e33b32..72fc0b2706be056e5dad5807c4fa1bbe4ba32b56 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -35,22 +35,14 @@ int deny_severity = LOG_NOTICE;
 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;
@@ -403,10 +395,22 @@ static int slap_get_listener_addresses(
                        return -1;
                }
 
-               sai = res;
                sap = *sal;
 
-               do {
+               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;
+                       }
+
                        switch (sai->ai_family) {
 #  ifdef LDAP_PF_INET6
                        case AF_INET6:
@@ -436,7 +440,7 @@ static int slap_get_listener_addresses(
                                (*sap)->sa_family = sai->ai_family;
                                sap++;
                        }
-               } while ((sai = sai->ai_next) != NULL);
+               }
 
                *sap = NULL;
                freeaddrinfo(res);
@@ -498,6 +502,7 @@ static Listener * slap_open_listener(
        unsigned short port;
        int err, addrlen;
        struct sockaddr **sal, **psal;
+       int socktype = SOCK_STREAM;     /* default to COTS */
 
        rc = ldap_url_parse( url, &lud );
 
@@ -543,7 +548,8 @@ static Listener * slap_open_listener(
 
        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);
@@ -564,6 +570,9 @@ static Listener * slap_open_listener(
                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 )
                {
@@ -593,7 +602,11 @@ static Listener * slap_open_listener(
                        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
@@ -931,6 +944,17 @@ slapd_daemon_task(
        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();
@@ -1146,6 +1170,26 @@ slapd_daemon_task(
                        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 ) {
@@ -1167,7 +1211,7 @@ slapd_daemon_task(
 #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 ));
@@ -1404,6 +1448,13 @@ slapd_daemon_task(
 
                        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;
                                }
@@ -1453,6 +1504,10 @@ slapd_daemon_task(
 
                        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;
                                }
@@ -1501,6 +1556,10 @@ slapd_daemon_task(
 
                        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;
                                }