diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/ChangeLog | 7 | ||||
| -rw-r--r-- | util/http.c | 10 | ||||
| -rw-r--r-- | util/srv.h | 49 |
3 files changed, 13 insertions, 53 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 7f675b508..f44e45977 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,10 @@ +2009-04-05 David Shaw <[email protected]> + + * srv.h: Move to include/srv.h. + + * http.c (send_request): Pass in srvtag... + (http_open): ...from here. + 2009-04-02 David Shaw <[email protected]> * http.c (connect_server): free (rather than xfree) the result of diff --git a/util/http.c b/util/http.c index 3fcce9278..5e025b658 100644 --- a/util/http.c +++ b/util/http.c @@ -68,7 +68,8 @@ static int remove_escapes( byte *string ); static int insert_escapes( byte *buffer, const byte *string, const byte *special ); static URI_TUPLE parse_tuple( byte *string ); -static int send_request( HTTP_HD hd, const char *auth, const char *proxy ); +static int send_request( HTTP_HD hd, const char *auth, const char *proxy, + const char *srvtag); static byte *build_rel_path( PARSED_URI uri ); static int parse_response( HTTP_HD hd ); @@ -165,7 +166,7 @@ http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url, rc = parse_uri( &hd->uri, url ); if( !rc ) { - rc = send_request( hd, auth, proxy ); + rc = send_request( hd, auth, proxy, srvtag ); if( !rc ) { hd->fp_write = iobuf_sockopen( hd->sock , "w" ); if( hd->fp_write ) @@ -519,7 +520,8 @@ parse_tuple( byte *string ) * Returns 0 if the request was successful */ static int -send_request( HTTP_HD hd, const char *auth, const char *proxy ) +send_request( HTTP_HD hd, const char *auth, const char *proxy, + const char *srvtag ) { const byte *server; byte *request, *p; @@ -556,7 +558,7 @@ send_request( HTTP_HD hd, const char *auth, const char *proxy ) release_parsed_uri( uri ); } else - hd->sock = connect_server( server, port, hd->flags, hd->uri->scheme ); + hd->sock = connect_server( server, port, hd->flags, srvtag ); if(auth || hd->uri->auth) { diff --git a/util/srv.h b/util/srv.h deleted file mode 100644 index fdd568a5f..000000000 --- a/util/srv.h +++ /dev/null @@ -1,49 +0,0 @@ -/* srv.h - * Copyright (C) 2003, 2004 Free Software Foundation, Inc. - * - * This file is part of GNUPG. - * - * GNUPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * GNUPG is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef _SRV_H_ -#define _SRV_H_ - -#ifdef USE_DNS_SRV -#ifdef _WIN32 -#include <windows.h> -#else -#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h> -#endif /* !_WIN32 */ -#endif /* USE_DNS_SRV */ -#include "types.h" - -#ifndef MAXDNAME -#define MAXDNAME 1025 -#endif - -struct srventry -{ - u16 priority; - u16 weight; - u16 port; - int run_count; - char target[MAXDNAME]; -}; - -int getsrv(const char *name,struct srventry **list); - -#endif /* !_SRV_H_ */ |