[svn] GnuPG - r4982 - in branches/STABLE-BRANCH-1-4: include util

[svn author dshaw]

Author: dshaw
Date: 2009-04-06 05:18:07 +0200 (Mon, 06 Apr 2009)
New Revision: 4982

Added:
   branches/STABLE-BRANCH-1-4/include/srv.h
Removed:
   branches/STABLE-BRANCH-1-4/util/srv.h
Modified:
   branches/STABLE-BRANCH-1-4/include/ChangeLog
   branches/STABLE-BRANCH-1-4/util/ChangeLog
   branches/STABLE-BRANCH-1-4/util/http.c
Log:
* srv.h: Move to include/srv.h.

* http.c (send_request): Pass in srvtag...  (http_open): ...from here.


Modified: branches/STABLE-BRANCH-1-4/include/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/include/ChangeLog	2009-04-03 10:41:33 UTC (rev 4981)
+++ branches/STABLE-BRANCH-1-4/include/ChangeLog	2009-04-06 03:18:07 UTC (rev 4982)
@@ -1,3 +1,7 @@
+2009-04-05  David Shaw  <dshaw at jabberwocky.com>
+
+	* srv.h: Move from util/srv.h.
+
 2009-04-02  David Shaw  <dshaw at jabberwocky.com>
 
 	* http.h: Allow passing srvtag to http_open and

Copied: branches/STABLE-BRANCH-1-4/include/srv.h (from rev 4949, branches/STABLE-BRANCH-1-4/util/srv.h)
===================================================================
--- branches/STABLE-BRANCH-1-4/include/srv.h	                        (rev 0)
+++ branches/STABLE-BRANCH-1-4/include/srv.h	2009-04-06 03:18:07 UTC (rev 4982)
@@ -0,0 +1,49 @@
+/* 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_ */

Modified: branches/STABLE-BRANCH-1-4/util/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/util/ChangeLog	2009-04-03 10:41:33 UTC (rev 4981)
+++ branches/STABLE-BRANCH-1-4/util/ChangeLog	2009-04-06 03:18:07 UTC (rev 4982)
@@ -1,3 +1,10 @@
+2009-04-05  David Shaw  <dshaw at jabberwocky.com>
+
+	* srv.h: Move to include/srv.h.
+
+	* http.c (send_request): Pass in srvtag...
+	(http_open): ...from here.
+
 2009-04-02  David Shaw  <dshaw at jabberwocky.com>
 
 	* http.c (connect_server): free (rather than xfree) the result of

Modified: branches/STABLE-BRANCH-1-4/util/http.c
===================================================================
--- branches/STABLE-BRANCH-1-4/util/http.c	2009-04-03 10:41:33 UTC (rev 4981)
+++ branches/STABLE-BRANCH-1-4/util/http.c	2009-04-06 03:18:07 UTC (rev 4982)
@@ -68,7 +68,8 @@
 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 @@
 
     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 @@
  * 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 @@
 	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)
       {

Deleted: branches/STABLE-BRANCH-1-4/util/srv.h