moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 20:15:03 -05:00
Code Issues Releases Wiki Activity

Moved more generic functions to util.[ch]

Browse Source 
Added resolve.c to simply resolve a given host name
This commit is contained in:
Daniel Stenberg 2005-05-17 10:22:22 +00:00
parent ede9fb4fcc
commit 84fd4686e2
6 changed files with 238 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/server/Makefile.am
View File

@ -25,12 +25,13 @@ AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include
noinst_PROGRAMS = sws getpart sockfilt noinst_PROGRAMS = sws getpart sockfilt resolve
useful = getpart.c getpart.h $(top_srcdir)/lib/strequal.c \ useful = getpart.c getpart.h $(top_srcdir)/lib/strequal.c \
$(top_srcdir)/lib/base64.c $(top_srcdir)/lib/mprintf.c \ $(top_srcdir)/lib/base64.c $(top_srcdir)/lib/mprintf.c \
$(top_srcdir)/lib/memdebug.c $(top_srcdir)/lib/timeval.c $(top_srcdir)/lib/memdebug.c $(top_srcdir)/lib/timeval.c
resolve_SOURCES= resolve.c util.c util.h $(useful)
sws_SOURCES= sws.c util.c util.h $(useful) sws_SOURCES= sws.c util.c util.h $(useful)
sockfilt_SOURCES = sockfilt.c util.c util.h $(useful) \ sockfilt_SOURCES = sockfilt.c util.c util.h $(useful) \
$(top_srcdir)/lib/inet_pton.c $(top_srcdir)/lib/inet_pton.c

153
tests/server/resolve.c Normal file
View File

@ -0,0 +1,153 @@
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
* $Id$
***************************************************************************/
/* Purpose
*
* Resolve the given name, using system name resolve functions (NOT any
* function provided by libcurl). Used to see if the name exists and thus if
* we can allow a test case to use it for testing.
*
* Like if 'localhost' actual exists etc.
*
*/
#include "setup.h" /* portability help from the lib directory */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <signal.h>
#include <time.h>
#include <ctype.h>
#include <sys/time.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
#ifdef _XOPEN_SOURCE_EXTENDED
/* This define is "almost" required to build on HPUX 11 */
#include <arpa/inet.h>
#endif
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
#define ENABLE_CURLX_PRINTF
/* make the curlx header define all printf() functions to use the curlx_*
versions instead */
#include "curlx.h" /* from the private lib dir */
#include "util.h"
/* include memdebug.h last */
#include "memdebug.h"
char use_ipv6=FALSE;
const char *serverlogfile=""; /* for a util.c function we don't use */
int main(int argc, char *argv[])
{
int arg=1;
char *host;
while(argc>arg) {
if(!strcmp("--version", argv[arg])) {
printf("resolve IPv4%s\n",
#ifdef ENABLE_IPV6
"/IPv6"
#else
""
#endif
);
return 0;
}
else if(!strcmp("--ipv6", argv[arg])) {
#ifdef ENABLE_IPV6
use_ipv6=TRUE;
#endif
arg++;
}
else if(!strcmp("--ipv4", argv[arg])) {
/* for completeness, we support this option as well */
use_ipv6=FALSE;
arg++;
}
else {
host = argv[arg++];
}
}
if(!host) {
puts("Usage: resolve [option] <host>\n"
" --version\n"
" --ipv4\n"
" --ipv6");
return 0;
}
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
win32_init();
atexit(win32_cleanup);
#endif
#ifdef ENABLE_IPV6
if(!use_ipv6)
#endif
{
/* gethostbyname() resolve */
struct hostent *he;
he = gethostbyname(host);
printf("Resolve '%s' %s\n",
host, he?"SUCCESSFUL":"FAILED");
return he?0:1;
}
#ifdef ENABLE_IPV6
else {
/* getaddrinfo() resolve */
struct addrinfo *ai;
struct addrinfo hints;
int rc;
memset(&hints, 0, sizeof(hints));
hints.ai_family = PF_INET6;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_CANONNAME;
rc = (getaddrinfo)(host, "80", &hints, &ai);
printf("Resolve '%s' %s\n",
host, !rc?"SUCCESSFUL":"FAILED");
return !rc?0:1;
}
#endif
return 0;
}

76
tests/server/sockfilt.c
View File

@ -83,33 +83,6 @@
#include "inet_pton.h" #include "inet_pton.h"
#include "util.h" #include "util.h"
#ifndef FALSE
#define FALSE 0
#endif
#ifndef TRUE
#define TRUE 1
#endif
#if defined(WIN32) && !defined(__CYGWIN__)
#include <windows.h>
#include <winsock2.h>
#include <process.h>
#define sleep(sec) Sleep ((sec)*1000)
#define EINPROGRESS WSAEINPROGRESS
#define EWOULDBLOCK WSAEWOULDBLOCK
#define EISCONN WSAEISCONN
#define ENOTSOCK WSAENOTSOCK
#define ECONNREFUSED WSAECONNREFUSED
static void win32_cleanup(void);
#if defined(ENABLE_IPV6) && defined(__MINGW32__)
const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};
#endif
#endif
/* include memdebug.h last */ /* include memdebug.h last */
#include "memdebug.h" #include "memdebug.h"
@ -157,55 +130,6 @@ static void sigpipe_handler(int sig)
} }
#endif #endif
#if defined(WIN32) && !defined(__CYGWIN__)
#undef perror
#define perror(m) win32_perror(m)
static void win32_perror(const char *msg)
{
char buf[256];
DWORD err = WSAGetLastError();
if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err,
LANG_NEUTRAL, buf, sizeof(buf), NULL))
snprintf(buf, sizeof(buf), "Unknown error %lu (%#lx)", err, err);
if (msg)
fprintf(stderr, "%s: ", msg);
fprintf(stderr, "%s\n", buf);
}
#endif
#if defined(WIN32) && !defined(__CYGWIN__)
static void win32_init(void)
{
WORD wVersionRequested;
WSADATA wsaData;
int err;
wVersionRequested = MAKEWORD(2, 0);
err = WSAStartup(wVersionRequested, &wsaData);
if (err != 0) {
perror("Winsock init failed");
logmsg("Error initialising winsock -- aborting\n");
exit(1);
}
if ( LOBYTE( wsaData.wVersion ) != 2 ||
HIBYTE( wsaData.wVersion ) != 0 ) {
WSACleanup();
perror("Winsock init failed");
logmsg("No suitable winsock.dll found -- aborting\n");
exit(1);
}
}
static void win32_cleanup(void)
{
WSACleanup();
}
#endif
char use_ipv6=FALSE; char use_ipv6=FALSE;
unsigned short port = DEFAULT_PORT; unsigned short port = DEFAULT_PORT;
unsigned short connectport = 0; /* if non-zero, we activate this mode */ unsigned short connectport = 0; /* if non-zero, we activate this mode */

80
tests/server/sws.c
View File

@ -62,37 +62,6 @@
#include "getpart.h" #include "getpart.h"
#include "util.h" #include "util.h"
#ifdef ENABLE_IPV6
#define SWS_IPV6
#endif
#ifndef FALSE
#define FALSE 0
#endif
#ifndef TRUE
#define TRUE 1
#endif
#if defined(WIN32) && !defined(__CYGWIN__)
#include <windows.h>
#include <winsock2.h>
#include <process.h>
#define sleep(sec) Sleep ((sec)*1000)
#define EINPROGRESS WSAEINPROGRESS
#define EWOULDBLOCK WSAEWOULDBLOCK
#define EISCONN WSAEISCONN
#define ENOTSOCK WSAENOTSOCK
#define ECONNREFUSED WSAECONNREFUSED
static void win32_cleanup(void);
#if defined(ENABLE_IPV6) && defined(__MINGW32__)
const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};
#endif
#endif
/* include memdebug.h last */ /* include memdebug.h last */
#include "memdebug.h" #include "memdebug.h"
@ -199,24 +168,6 @@ static void sigpipe_handler(int sig)
} }
#endif #endif
#if defined(WIN32) && !defined(__CYGWIN__)
#undef perror
#define perror(m) win32_perror(m)
static void win32_perror (const char *msg)
{
char buf[256];
DWORD err = WSAGetLastError();
if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err,
LANG_NEUTRAL, buf, sizeof(buf), NULL))
snprintf(buf, sizeof(buf), "Unknown error %lu (%#lx)", err, err);
if (msg)
fprintf(stderr, "%s: ", msg);
fprintf(stderr, "%s\n", buf);
}
#endif
static char *test2file(long testno) static char *test2file(long testno)
{ {
static char filename[256]; static char filename[256];
@ -678,37 +629,6 @@ static int send_doc(int sock, struct httprequest *req)
return 0; return 0;
} }
#if defined(WIN32) && !defined(__CYGWIN__)
static void win32_init(void)
{
WORD wVersionRequested;
WSADATA wsaData;
int err;
wVersionRequested = MAKEWORD(2, 0);
err = WSAStartup(wVersionRequested, &wsaData);
if (err != 0) {
perror("Winsock init failed");
logmsg("Error initialising winsock -- aborting\n");
exit(1);
}
if ( LOBYTE( wsaData.wVersion ) != 2 ||
HIBYTE( wsaData.wVersion ) != 0 ) {
WSACleanup();
perror("Winsock init failed");
logmsg("No suitable winsock.dll found -- aborting\n");
exit(1);
}
}
static void win32_cleanup(void)
{
WSACleanup();
}
#endif
char use_ipv6=FALSE; char use_ipv6=FALSE;
int main(int argc, char *argv[]) int main(int argc, char *argv[])

49
tests/server/util.c
View File

@ -96,3 +96,52 @@ void logmsg(const char *msg, ...)
if(logfp) if(logfp)
fclose(logfp); fclose(logfp);
} }
#if defined(WIN32) && !defined(__CYGWIN__)
/* use instead of perror() on generic windows */
void win32_perror (const char *msg)
{
char buf[256];
DWORD err = WSAGetLastError();
if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err,
LANG_NEUTRAL, buf, sizeof(buf), NULL))
snprintf(buf, sizeof(buf), "Unknown error %lu (%#lx)", err, err);
if (msg)
fprintf(stderr, "%s: ", msg);
fprintf(stderr, "%s\n", buf);
}
#endif
#if defined(WIN32) && !defined(__CYGWIN__)
void win32_init(void)
{
WORD wVersionRequested;
WSADATA wsaData;
int err;
wVersionRequested = MAKEWORD(2, 0);
err = WSAStartup(wVersionRequested, &wsaData);
if (err != 0) {
perror("Winsock init failed");
logmsg("Error initialising winsock -- aborting\n");
exit(1);
}
if ( LOBYTE( wsaData.wVersion ) != 2 ||
HIBYTE( wsaData.wVersion ) != 0 ) {
WSACleanup();
perror("Winsock init failed");
logmsg("No suitable winsock.dll found -- aborting\n");
exit(1);
}
}
void win32_cleanup(void)
{
WSACleanup();
}
#endif

34
tests/server/util.h
View File

@ -26,5 +26,39 @@
int ourerrno(void); int ourerrno(void);
void logmsg(const char *msg, ...); void logmsg(const char *msg, ...);
#ifndef FALSE
#define FALSE 0
#endif
#ifndef TRUE
#define TRUE 1
#endif
#if defined(WIN32) && !defined(__CYGWIN__)
#include <windows.h>
#include <winsock2.h>
#include <process.h>
#define sleep(sec) Sleep ((sec)*1000)
#define EINPROGRESS WSAEINPROGRESS
#define EWOULDBLOCK WSAEWOULDBLOCK
#define EISCONN WSAEISCONN
#define ENOTSOCK WSAENOTSOCK
#define ECONNREFUSED WSAECONNREFUSED
static void win32_cleanup(void);
#if defined(ENABLE_IPV6) && defined(__MINGW32__)
const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};
#endif
#endif
#endif #endif
#if defined(WIN32) && !defined(__CYGWIN__)
#undef perror
#define perror(m) win32_perror(m)
#endif
void win32_init(void);
void win32_cleanup(void);