From 41bb01ae792af78edd28bf1b735cacc0b3ac428a Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 22 Oct 2015 09:22:41 +0200 Subject: Move SRV RR code from common/ to dirmngr/. * common/srv.c: Merge into dirmngr/dns-stuff.c. Delete file. * common/srv.h: Merge into dirmngr/dns-stuff.h. Delete file. * common/Makefile.am (common_sources): Remove srv.c and srv.h. * g10/keyserver.c: Do not include srv.h. The code using it is anyway disabled. * dirmngr/http.c: Remove header srv.h and stubs. * dirmngr/t-dns-stuff.c: Add option --srv. Signed-off-by: Werner Koch --- common/srv.h | 62 ------------------------------------------------------------ 1 file changed, 62 deletions(-) delete mode 100644 common/srv.h (limited to 'common/srv.h') diff --git a/common/srv.h b/common/srv.h deleted file mode 100644 index 016d2b1f4..000000000 --- a/common/srv.h +++ /dev/null @@ -1,62 +0,0 @@ -/* srv.h - * Copyright (C) 2003, 2004 Free Software Foundation, Inc. - * - * This file is part of GNUPG. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of either - * - * - the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at - * your option) any later version. - * - * or - * - * - the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at - * your option) any later version. - * - * or both in parallel, as here. - * - * This file 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 . - */ - -#ifndef GNUPG_COMMON_SRV_H -#define GNUPG_COMMON_SRV_H - -#ifdef USE_DNS_SRV -# ifdef _WIN32 -# ifdef HAVE_WINSOCK2_H -# include -# endif -# include -# else -# include -# include -# include -# endif /* !_WIN32 */ -#endif /* USE_DNS_SRV */ - - -#ifndef MAXDNAME -#define MAXDNAME 1025 -#endif - -struct srventry -{ - unsigned short priority; - unsigned short weight; - unsigned short port; - int run_count; - char target[MAXDNAME]; -}; - -int getsrv(const char *name,struct srventry **list); - -#endif /*GNUPG_COMMON_SRV_H*/ -- cgit v1.2.3