]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Revert "proxy: Fix issue to process empty data (#4797)"
authorAlan T. DeKok <aland@freeradius.org>
Thu, 10 Nov 2022 16:42:12 +0000 (16:42 +0000)
committerAlan T. DeKok <aland@freeradius.org>
Thu, 10 Nov 2022 16:42:12 +0000 (16:42 +0000)
This reverts commit fb8492a560cac19f8bc47dd4fc3b7259dfbaba5c.

sock->ssn must NEVER be NULL for a TLS socket.

src/main/tls_listen.c

index dd5aae9470f151d7057522b59e46865063a6cd95..e9163ed8c83598bfbdbeb4634e3ea8d85aad60da 100644 (file)
@@ -73,7 +73,7 @@ static void tls_socket_close(rad_listen_t *listener)
 {
        listen_socket_t *sock = listener->data;
 
-       if (sock->ssn && sock->ssn->ssl) SSL_shutdown(sock->ssn->ssl);
+       SSL_shutdown(sock->ssn->ssl);
 
        listener->status = RAD_LISTEN_STATUS_EOL;
        listener->tls = NULL; /* parent owns this! */
@@ -1059,11 +1059,6 @@ static ssize_t proxy_tls_read(rad_listen_t *listener)
        uint8_t *data;
        listen_socket_t *sock = listener->data;
 
-       if (!sock->ssn) {
-               tls_error_log(NULL, "Failed in proxy receive, no data received");
-               return -1;
-       }
-
        if (!sock->ssn->connected) {
                rcode = try_connect(sock);
                if (rcode <= 0) return rcode;