X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=comstack%2Ftcpip.c;h=05b10dd1002885211dbf1e56fe30943b6e8f2a19;hb=05d1794c4ac57eabe6f6da766156f6986d5c987c;hp=b1f4f737562fd7b34912662916a7bc6e013bae3c;hpb=4ca818ec201c9dcf5461e419002c95fd2eac620e;p=yaz-moved-to-github.git diff --git a/comstack/tcpip.c b/comstack/tcpip.c index b1f4f73..05b10dd 100644 --- a/comstack/tcpip.c +++ b/comstack/tcpip.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * - * $Id: tcpip.c,v 1.55 2003-02-21 12:08:57 adam Exp $ + * $Id: tcpip.c,v 1.57 2003-05-13 14:21:13 adam Exp $ */ #include @@ -225,11 +225,12 @@ COMSTACK ssl_type(int s, int blocking, int protocol, void *vp) } #endif -int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add) +int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add, + int default_port) { struct hostent *hp; char *p, buf[512]; - short int port = 210; + short int port = default_port; unsigned tmpadd; if (!tcpip_init ()) @@ -261,8 +262,12 @@ int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add) void *tcpip_straddr(COMSTACK h, const char *str) { tcpip_state *sp = (tcpip_state *)h->cprivate; + int port = 210; - if (!tcpip_strtoaddr_ex (str, &sp->addr)) + if (h->protocol == PROTO_HTTP) + port = 80; + + if (!tcpip_strtoaddr_ex (str, &sp->addr, port)) return 0; return &sp->addr; } @@ -271,7 +276,7 @@ struct sockaddr_in *tcpip_strtoaddr(const char *str) { static struct sockaddr_in add; - if (!tcpip_strtoaddr_ex (str, &add)) + if (!tcpip_strtoaddr_ex (str, &add, 210)) return 0; return &add; } @@ -298,7 +303,7 @@ int tcpip_connect(COMSTACK h, void *address) int r; #ifdef __sun__ int recbuflen; - socklen_t rbufsize = sizeof(recbuflen); + YAZ_SOCKLEN_T rbufsize = sizeof(recbuflen); #endif TRC(fprintf(stderr, "tcpip_connect\n")); h->io_pending = 0; @@ -1053,10 +1058,18 @@ char *tcpip_addrstr(COMSTACK h) r = (char*) host->h_name; else r = inet_ntoa(addr.sin_addr); - sprintf(buf, "tcp:%s", r); + if (h->protocol == PROTO_HTTP) + sprintf(buf, "http:%s", r); + else + sprintf(buf, "tcp:%s", r); #if HAVE_OPENSSL_SSL_H if (sp->ctx) - sprintf(buf, "ssl:%s", r); + { + if (h->protocol == PROTO_HTTP) + sprintf(buf, "https:%s", r); + else + sprintf(buf, "ssl:%s", r); + } #endif return buf; }