Fix ipv6 support in ccs_sync
PATCH 1/1 Fix ipv6 support in ccs_sync
Signed-off-by Lon Hohberger <[email protected]>
--- ricci/ccs_sync/Makefile | 2 +- ricci/ccs_sync/ricci_conf.c | 54 +++++++++++++++++++++++++++++++++++------- ricci/ccs_sync/ricci_net.h | 1 + ricci/ccs_sync/ricci_nss.c | 29 +++++++++++++++++++++- ricci/ccs_sync/ricci_nss.h | 9 ++++-- 5 files changed, 80 insertions(+), 15 deletions(-)
ricci/ccs_sync/Makefile +1 -1
@@ -25,7 +25,7 @@ OBJECTS = \ CC=gcc INCLUDE = -I/usr/include/libxml2 -I/usr/include/nspr4 `nss-config --cflags` CFLAGS = -O2 -Wall -Wextra -Wformat=2 -fstack-protector -Wshadow $(INCLUDE) -LDFLAGS = -lxml2 `nss-config --libs` +LDFLAGS = -lxml2 `nss-config --libs` `nspr-config --libs` all: ${TARGET}
ricci/ccs_sync/ricci_conf.c +45 -9
88 lines not on this page · raw message
ricci/ccs_sync/ricci_net.h +1 -0
@@ -26,6 +26,7 @@ enum {struct ricci_conn {PRFileDesc *fd; +PRNetAddr *pr_addr;char *hostname;char *cluster_name;char *buf;
ricci/ccs_sync/ricci_nss.c +27 -2
@@ -114,14 +114,14 @@ PRStatus set_nss_sockopt_nonblock(PRFileDesc *sock, PRBool val) {return (PR_SetSocketOption (sock, &sock_opt)); } -PRFileDesc *get_ssl_socket (const char *cert_nick,PRBool nonblocking) { +PRFileDesc *get_ssl_socket (const char *cert_nick,PRBool nonblocking,PRUint16 af) {PRFileDesc *tcp_sock;PRFileDesc *ssl_sock;PRSocketOptionData sock_opt;PRStatus pr_status;SECStatus sec_status; - tcp_sock =PR_NewTCPSocket (); + tcp_sock =PR_OpenTCPSocket (af);if (tcp_sock ==NULL )return (NULL );
@@ -176,6 +176,7 @@ PRFileDesc *get_ssl_socket(const char *cert_nick, PRBool nonblocking) {return (ssl_sock); } +PRStatus nss_connect (PRFileDesc *sock,const char *addr_str,uint16_t port) {char buf[PR_NETDB_BUF_SIZE ];PRStatus pr_status;
@@ -209,6 +210,30 @@ PRStatus nss_connect(PRFileDesc *sock, const char *addr_str, uint16_t port) {return (PR_SUCCESS ); } + +PRStatus nss_connect_by_addr (PRFileDesc *sock,const char *addr_str, +PRNetAddr *target) +{ +SECStatus sec_status; +PRStatus pr_status; + + sec_status =SSL_SetURL (sock, addr_str); +if (sec_status != SECSuccess) +return (PR_FAILURE ); + + pr_status =PR_Connect (sock, target,PR_INTERVAL_NO_TIMEOUT ); +if (pr_status !=PR_SUCCESS ) { +if (errno !=EINPROGRESS ) +return (pr_status); + } + + sec_status =SSL_ResetHandshake (sock,PR_FALSE ); +if (sec_status != SECSuccess) +return (PR_FAILURE ); + +return (PR_SUCCESS ); +} +int init_libnss_ssl (const char *cert_db_dir) {SECStatus status;
ricci/ccs_sync/ricci_nss.h +6 -3
@@ -12,10 +12,13 @@#define __RICCI_NSS_HSECStatus nss_connect (PRFileDesc *ssl_sock, -const char *addr_str, -uint16_t port); +const char *addr_str, +uint16_t port); +SECStatus nss_connect_by_addr (PRFileDesc *ssl_sock, +const char *addr_str, +PRNetAddr *addr); -PRFileDesc *get_ssl_socket (const char *cert_nick,PRBool nonblocking); +PRFileDesc *get_ssl_socket (const char *cert_nick,PRBool nonblocking,PRUint16 af);int init_libnss_ssl (const char *cert_db_dir);int shutdown_libnss_ssl (void );PRStatus set_nss_sockopt_nonblock (PRFileDesc *sock,PRBool val);
Signature · 1 line
1.7.2.2