New home at Framagit (and emphasizes it is unmaintained)

Added support for an HTTP 204 No Content response code

JTR/Makefile

@@ -0,0 +1,9 @@
+include ../../../lib/Makefile-tex
+
+%.epic: %.gp 
+	gnuplot $^ > $@
+
+%.eps: %.gp 
+	gnuplot $^ > $@
+
+

JTR/echoping.tex

@@ -0,0 +1,270 @@
+% $Id$
+
+% Mise au point
+\documentclass[a4,landscape,article]{seminar}
+
+% Impression réelle
+%\documentclass[a4,landscape,slidesonly]{seminar}
+
+\usepackage[latin1]{inputenc}
+\usepackage{fancybox}
+\usepackage{eepic}
+\usepackage{latexsym}
+\usepackage{bortzmeyer-utils}
+\newpagestyle{MH}%
+  {\thepage}
+  {echoping\hfil}
+\slidepagestyle{MH}
+
+\pagestyle{empty}
+
+\title{echoping, mesurer les applications}
+\author{Stéphane Bortzmeyer\\
+AFNIC\\
+\url{<bortz@users.sourceforge.net>}
+}
+\date{4 octobre 2004}
+
+\begin{document}
+
+\begin{slide}
+\maketitle
+\addtocounter{slide}{-1}
+\slidepagestyle{empty}
+\end{slide}
+
+\begin{slide}
+\heading{Mesurer les applications}
+\begin{itemize}
+  \item On mesure souvent le temps de réponse du réseau (RTT) avec ping
+\item Mais celui des applications peut être très différent
+  \begin{enumerate}
+    \item Unix : traitement par le noyau ou par une application qui
+    \foreign{swappe}
+    \item Délais spécifiques à l'application (contacter la base de
+    données\ldots)
+    \item Coupe-feux qui bloquent ICMP
+    \item \foreign{Layer-4 or Layer-7 switches} qui traitent différemment ICMP et TCP
+  \end{enumerate}
+\end{itemize}
+\end{slide}
+
+\begin{slide}
+\heading{Limite des outils classiques}
+Certains outils n'ont pas de mesure du RTT : on les emballe avec
+\computer{time}. Inconvénients :
+\begin{enumerate}
+  \item On mesure le temps de résolution DNS, 
+  \item On mesure le temps de lancement du
+  programme (s'il est en Perl, cela fausse tout)\ldots
+\end{enumerate}
+
+Certains outils ont la mesure de RTT (\computer{dig}). Mais pas de
+possibilité de répéter le test donc, il faut utiliser \computer{awk}
+si on veut des statistiques.
+\end{slide}
+
+Exemple avec dig, le script qtest, qui détermine le serveur le plus
+rapide (BIND utilise un algorithme analogue pour savoir quel serveur
+d'un domaine interroger).
+\begin{info}
+#!/bin/sh
+#
+# From: Joe Abley <jabley@isc.org>
+
+query=$1; shift
+#
+[ -z "$*" ] && echo "Syntax: $0 query server..." && exit 1
+#
+for i in 0 1 2; do
+   for server in $*; do
+     dig @${server} ${query};
+   done
+done | \
+   awk '/^;; Query time:/ { query_time = $4; } \
+     /^;; SERVER: / { sum[$3] += query_time; num[$3]++; } \
+     END { for (server in sum) { print int(sum[server]/num[server]), server; } }' | \
+   sort -n | head -1
+\end{info}
+
+\begin{slide}
+  \heading{echoping}
+\url{http://echoping.sourceforge.net/}
+
+9 ans d'utilisation aujourd'hui.
+
+A surtout décollé dans le cadre du projet Renater-Cache (mesurer le
+temps de réponse du cache national, par exemple avant et après un réglage).
+
+Mesurer le RTT d'une requête applicative. Le chrono est lancé
+\emph{après} la résolution DNS. 
+
+Tourne sur tout Unix, en ligne de commandes, pour utilisation par des
+scripts (mon, Nagios, MRTG, Smokeping).
+
+Smokeping (\url{http://www.smokeping.org/}) est de loin le plus gros
+utilisateur d'echoping.
+\end{slide}
+
+\begin{slide}
+\heading{Protocoles utilisés}
+\begin{enumerate}
+  \item Au début, echo, discard et chargen
+ \item Puis HTTP (Renater-Cache), toujours le plus utilisé
+  \item Demain, DNS, whois, PostgreSQL, LDAP\ldots
+\end{enumerate}
+
+\end{slide}
+
+\begin{slide}
+  \heading{Répétition des tests}
+
+Comme ping, on peut répéter les tests et avoir des statistiques.
+  \begin{info}
+% echoping -h 10 -h / webmail.nic.af
+...
+Minimum time: 1.799637 seconds (142 bytes per sec.)
+Maximum time: 16.494219 seconds (16 bytes per sec.)
+Average time: 3.356738 seconds (76 bytes per sec.)
+Standard deviation: 3.730219
+Median time: 2.003397 seconds (128 bytes per sec.)
+  \end{info}
+\end{slide}
+
+\begin{slide}
+  \heading{Moyenne et médiane}
+Sur l'Internet, ou sur un serveur chargé, la moyenne est peu
+significative : un seul test très lent la change beaucoup.
+
+La médiane est en général plus informative.
+
+\begin{info}
+Elapsed time: 3.030966 seconds
+Elapsed time: 122.533918 seconds
+Elapsed time: 2.394198 seconds
+Elapsed time: 2.012312 seconds
+Elapsed time: 1.432407 seconds
+...
+---
+Minimum time: 1.432407 seconds (179 bytes per sec.)
+Maximum time: 122.533918 seconds (2 bytes per sec.)
+Average time: 11.393709 seconds (22 bytes per sec.)
+Standard deviation: 26.072556
+Median time: 2.712582 seconds (94 bytes per sec.)
+\end{info}
+\end{slide}
+
+%\begin{slide}
+%  \heading{Les temps de réponse et leur variation}
+%\input{whois-ripe.epic}
+%\end{slide}
+
+\begin{slide}
+\heading{Les greffons}  
+Beaucoup d'utilisateurs réclamaient le support de tel ou tel
+protocole. 
+
+Souvent, ils envoyaient le \foreign{patch}.
+
+Le code devenait de plus en plus complexe. Et dépendant de
+bibliothèques extérieures.
+
+echoping 6 introduira donc les greffons (\foreign{plug-ins}), écrits à
+part et chargés dynamiquement.
+
+\end{slide}
+
+\begin{slide}
+  \heading{Utiliser le greffon DNS}
+  \begin{info}
+% echoping -v -m dns ns2.nic.fr -t NS nic.fr
+This is echoping, version 6.0-BETA.
+
+Running start() for the plugin dns.so...
+Trying to call plugin dns.so for internet address 192.134.0.4 53...
+Elapsed time: 0.001717 seconds
+  \end{info}
+\end{slide}
+
+\begin{slide}
+  \heading{Utiliser le greffon PostgreSQL}
+  \begin{info}
+% echoping -v -m postgresql localhost -c 'dbname=essais' \
+        'SELECT * FROM Foobar'
+
+This is echoping, version 6.0-BETA.
+
+Running start() for the plugin postgresql.so...
+Trying to call plugin postgresql.so...
+3 tuples returned
+Elapsed time: 0.058392 seconds
+  \end{info}
+\end{slide}
+
+\begin{slide}
+  \heading{API des greffons}
+Les greffons se programment en C
+\begin{itemize}
+\item \computer{char * init (const int argc, const char **argv, const echoping\_options options)} Initialise
+\item \computer{void start (struct addrinfo *res)} Se connecte
+\item \computer{int execute ()} Le chronomètre est lancé juste avant
+\item \computer{void terminate ()}
+\end{itemize}
+\end{slide}
+
+Exemple avec le greffon whois, le plus simple vue la simplicité du
+protocole (\rfc{3912}) :
+\begin{info}
+char *
+init (const int argc, const char **argv, echoping_options global_options)
+{
+  /* Analyse les arguments */
+  return "nicname";
+}
+
+void
+start (struct addrinfo *res)
+{
+  whois_server = *res;
+}
+
+int
+execute ()
+{
+  int nr = 0;
+  char recvline[MAX_LINE + 1];
+  char complete_request[MAX_REQUEST];
+  if ((sockfd =
+       socket (whois_server.ai_family, whois_server.ai_socktype,
+	       whois_server.ai_protocol)) < 0)
+    err_sys ("Can't open socket");
+  if (connect (sockfd, whois_server.ai_addr, whois_server.ai_addrlen) < 0)
+    err_sys ("Can't connect to server");
+  if ((files = fdopen (sockfd, "r")) == NULL)
+    err_sys ("Cannot fdopen");
+  sprintf (complete_request, "%s\r\n", request);
+  n = strlen (complete_request);
+  if (writen (sockfd, complete_request, n) != n)
+    err_sys ("writen error on socket");
+  /* Read from the server */
+  while ((nr = readline (files, recvline, MAX_LINE, 0)) > 0)
+    if (dump)
+      printf ("%s", recvline);
+  if (dump)
+    printf ("\n");
+  close (sockfd);
+  return 1;
+}
+
+void
+terminate ()
+{
+}
+\end{info}
+
+\end{document}
+
+
+
+
+

JTR/whois-ripe.dat

@@ -0,0 +1,20 @@
+3.030966
+2.394198
+2.012312
+1.432407
+18.939303
+1.723371
+122.533918
+1.889161
+4.097886
+15.162768
+6.279619
+1.842766
+5.361982
+13.420383
+2.353872
+1.858294
+1.944411
+16.289352
+3.148175
+2.159049

JTR/whois-ripe.gp

@@ -0,0 +1,12 @@
+set terminal postscript portrait monochrome
+#set terminal tpic
+#set terminal x11
+set xlabel "Test number"
+set ylabel "Milli-seconds"
+set size 0.85,0.75
+set title "Response time of the RIPE whois server"
+set logscale y
+plot "whois-ripe.dat" with points pointsize 3 title "Tests", 2.713 with lines title "Median", 11.394 with lines title "Average"
+pause -1 "Hit return to continue"
+
+

README.md

@@ -0,0 +1,65 @@
+echoping
+========
+
+echoping **was** a small program to test (approximatively) performances of a remote host by sending it requests such as HTTP requests.
+
+echoping is **no longer** maintained. This repository is for
+historical interest only.
+
+To use it, simply:
+
+```
+% echoping machine.somewhere.org
+```
+
+or use the options before the machine name (see the man page).
+
+See the DETAILS file for various traps when benchmarking networks, specially with this program.
+
+In any case, be polite: don't bother the remote host with many repeated requests, especially with large size. Ask for permission if you often test hosts which aren't yours.
+
+Current features:
+
+    * plugins, so you can extend echoping with any protocol you like and/or use,
+    * Supports IPv6 as well as IPv4,
+    * Supports IDN (Unicode domain names like café.gennic.net),
+    * uses the protocols echo, discard, chargen or HTTP,
+    * can use cryptographic connections with HTTP,
+    * uses UDP instead of TCP for the protocols which accept it (like echo),
+    * can repeat the test and display various measures about it, 
+
+Examples of output:
+
+```
+    (Simple test with 1000 bytes echo TCP packets)
+
+    % echoping -v -s 1000 mycisco
+
+    This is echoping, version 5.0.0.
+
+    Trying to connect to internet address 172.21.0.14 7 to transmit 1000 bytes...
+    Connected...
+    TCP Latency: 0.003165 seconds
+    Sent (1000 bytes)...
+    Application Latency: 0.322183 seconds
+    1000 bytes read from server.
+    Checked
+    Elapsed time: 0.326960 seconds
+
+    (Repeated tests with average / mean and median displayed.)
+
+    % echoping -n 10 faraway-machine
+    [...]
+    Minimum time: 6.722336 seconds (38 bytes per sec.)
+    Maximum time: 17.975060 seconds (14 bytes per sec.)
+    Average time: 10.873267 seconds (24 bytes per sec.)
+    Standard deviation: 3.102793
+    Median  time: 9.218506 seconds (28 bytes per sec.)
+
+    (Testing a Web server with an HTTP request for its home page.)
+
+    %  echoping -h / mywww
+    Elapsed time: 0.686792 seconds
+```
+
+The exit status is set if there is any problem, so you can use echoping to test repeatedly a Web server, to be sure it runs fine (SmokePing does it).

SRC/AUTHORS

@@ -12,11 +12,14 @@ examples of code and beta-testing.
 
 Christian Grimm <grimm@rvs.uni-hannover.de> for the ICP code.
 
-Samuel Tardieu <sam@inf.enst.fr> for the SMTP code.
+Samuel Tardieu <sam@rfc1149.net> for the SMTP code.
 
 Pierre-Yves Lochou <lochou@ilog.fr> for a lot of testing, debugging
 and porting.
 
+Bertrand Petit <elrond@phoe.frmug.org> for a lot of testing, debugging
+and useful comments and advices.
+
 Glen Turner <glen.turner@aarnet.edu.au> for the Type Of Service code.
 
 Munechika Sumikawa <sumikawa@ebina.hitachi.co.jp>, from KAME, for the
@@ -25,6 +28,12 @@ adaptation to the new API, which allows IPv6.
 Luca Deri <deri@ntop.org> for the patch separating kernel (TCP) and
 application latency.
 
+Andy Juniper <ajuniper@freeuk.com> for the patch which excludes
+outliers from averages and from bug fixes on statistical calculations.
+
+SourceForge for the very good environment to work with. SourceForge
+changed the life of many free software programmers!
+
 The Pasteur Institute because the initial work was done when working
 on the French national Web cache project, while being an employee of
 the Institute.

SRC/COPYING

@@ -1,3 +1,13 @@
+The following note is not part of the GPL:
+
+echoping adds a small permission to the GPL: This program is released
+under the GPL with the additional exemption that compiling, linking,
+and/or using the OpenSSL library is allowed.
+
+See <URL:http://www.openssl.org/support/faq.html#LEGAL2> and
+<URL:http://lists.debian.org/debian-legal/2002/debian-legal-200210/msg00113.html>
+for details.
+
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 

SRC/ChangeLog

@@ -1,3 +1,40 @@
+6.1 (NOT YET)
+
+	DO NOT FORGET maintenance branch
+	
+6.0.1 (2007-04-04)
+
+	* Bug fixes only
+	
+6.0.0 (2007-03-26)
+
+	* Plugins: several plugins (whois, postgresql, dns) are now
+	shipped with echoping and you can write your own. All new
+	protocols will now be supported via plugins. Consequences:
+	   * you now need an Unix with a working dlopen(3)
+	   * echoping now requires the popt parsing library
+	* popt: echoping now depends on popt. One main change: options
+	parsing is lightly different so some scripts *may* break. A
+	typical example is that "old-school" Unix aggreation of arguments
+	("echoping -v4 localhost") is no longer accepted (use "echoping -v
+	-4 localhost").
+        * Many bug fixes, see the list at Sourceforge
+	
+5.2.0 (2004-02-29)
+
+	* IDN (Unicode domain names) support
+	
+5.1.0 (2003-11-09)
+
+	* GNU TLS support (alternative to OpenSSL),
+	* Small licence change,
+	* Portability fixes (MacOS X)
+	
+5.0.1 (2002-11-04)
+
+	* Small bug fixes,
+	* Better error messages with invalid options
+
 5.0.0 (2002-10-11)
 
 	* Now uses getnameinfo/getaddrinfo. Two consequences:

SRC/DETAILS

@@ -3,7 +3,7 @@ Some details about echoping
 
 echoping is a debugging tool. It is not a "end user" tool. For
 instance, HTTP testing takes host names, not URLs as parameters (if
-you want to test in a more HTTPish way, use wget). Also, when
+you want to test in a more HTTPish way, use wget or curl). Also, when
 connecting to a server which has both IPv4 and IPv6 addresses,
 echoping does not try every address in turn like most user-oriented
 programs do. If you want to test only the IPv4 address, use the
@@ -11,13 +11,13 @@ address, not the host name (or use the -4 option).
 
 echo service:
 
-echoping assumes the remote host accepts such connections. Experience
-show that most Internet routers do and many hosts also. However, some
-Unices are not shipped with this service enabled and, anyway, the
-administrator is always free to close it (I think they
-shouldn't). echoping has therefore less chance to succeed than ping or
-bing. (On a typical Unix box, "echo" service is configured in
-/etc/inetd.conf but see the CERT advisory
+echoping by default assumes the remote host accepts such
+connections. Experience show that most Internet routers or hosts could
+do it but do not by default. Most Unices are not shipped with this
+service enabled and, anyway, the administrator is always free to close
+it (I think they shouldn't). echoping has therefore less chance to
+succeed than ping or bing. (On a typical Unix box, "echo" service is
+configured in /etc/inetd.conf but see the CERT advisory
 <http://www.cert.org/advisories/CA-96.01.UDP_service_denial.html>.)
 
 What does it measure?
@@ -29,11 +29,18 @@ physical line raw throughput measures (unlike bing). On the other end,
 the action it performs are close from a HTTP request and it is
 meaningful to use it (carefully) to measure Web performances.
 
+More on Linux:
+
+On operating systems, like Linux, who have the TCP_INFO option (see
+http://linuxgazette.net/136/pfeiffer.html for a detailed
+presentation), echoping can also display interesting TCP information.
+
 UDP and inetd:
 
 With UDP servers you can have surprises: the first test is quite often
-much slower since inetd has to launch the process. After that, the
-process stays a while so the next texts run faster.
+much slower since inetd or xinetd typically has to launch the
+process. After that, the process stays a while so the next texts run
+faster.
 
 A nice example:
 
@@ -49,17 +56,25 @@ To measure performances on the Internet you can also see:
 
 Unix:
 
-- bing, a bandwidth measurement tool <ftp://ftp.lip6.fr/pub/networking>
+- thrulay, measures the capacity of a network by sending a bulk TCP
+  stream over it <http://shlang.com/thrulay/>
+- bing, a bandwidth measurement tool
+  <http://www.freenix.fr/freenix/logiciels/bing.html>
+- patchchar or pchar <http://www.employees.org/~bmah/Software/pchar/>,
+  a bandwidth measurement tool
 - ping, probably available with your system
 - traceroute, idem (otherwise, see <ftp://ftp.ee.lbl.gov/>)
 - ttcp, the best measurement tool but it needs some control over the 
-  two machines <ftp://ftp.arl.mil/pub/ttcp> (nothing to do with
-  the T/TCP protocol)
+  two machines <ftp://ftp.arl.mil/pub/ttcp> 
+- Netpipe, it needs some control over the 
+  two machines <ftp://ftp.scl.ameslab.gov/pub/netpipe/>
 - treno (evaluates available bandwidth for TCP) 
   <http://www.psc.edu/~pscnoc/treno_info.html>
 - spray is a tool which I dont't know very well. It is available on some 
   machines (Sun, OSF/1).
 I've also heard of but never tried:
+- the very good mon program <http://www.kernel.org/software/mon/> includes a 
+  up_rtt.monitor which has many similarities with echoping
 - NetPerf <http://www.netperf.org/netperf/NetperfPage.html>
 - a suite of Bandwidth Measuring programs from gnn@netcom.com 
   <ftp://ftp.netcom.com/~ftp/gnn/bwmeas-0.3.tar.Z>. These are several 
@@ -69,11 +84,12 @@ I've also heard of but never tried:
 Macintosh:
 
 - TCP Watcher, a very nice "swiss-army knife" tool, to test ping, DNS, echo. 
-  It includes an echo server. Available on Info-Mac in "comm/tcp".
+  It includes an echo server. Available on Info-Mac in "comm/inet".
 
 MS-Windows:
 
-(I have little knowledge of that environment and I tested nothing.) 
+(I have little knowledge of that environment and I tested nothing. The
+references here are quite old and should be checked.)
 
 - WSNUTIL. Seems to be an echo client and server. 
   <http://www.ccs.org/winsock/xref-e.html#echo_clients>
@@ -90,18 +106,49 @@ Panel
 
 Web clients:
 
-- You can ping or traceroute on the Web. See 
-  <http://www.freenix.org/cgi-bin/traceroute.iphtml>,
-  <http://www.tracert.com/> or
-  <http://www.fr.net/internet/trace.html>.
-
+- You can ping or traceroute on the Web. See
+  <http://www.traceroute.org/>.
 
 Use all of them with care, the result is not obvious to interpret.
 
+If you are interested in Internet measurements, there is an Internet
+Engineering Task Force Working Group, IPPM (IP Performance Metrics)
+which produces many fine RFC that are really good to read. See
+<http://www.ietf.org/html.charters/ippm-charter.html> for a full
+list. I appreciate RFC 2330 and 3148.
+
 And don't forget to read RFC 1470 ("Tools for Monitoring and Debugging
 TCP/IP Internets and Interconnected Devices"), specially its
 "Benchmark" section and the W. Richard Stevens' books (all of them),
 published by Addison-Wesley.
 
+If you want to modify echoping and test it against slow or lossy
+connections, it is good to be able to reporudce these bad conditions
+at will. To do so, you can use:
+
+On Linux, Netem :
+
+tc qdisc add dev eth0 root netem delay 50ms loss 10%
+tc qdisc add dev eth1 root netem delay 50ms loss 10%
+
+It depends on Netem (network emulation)
+
+ Networking -->
+   Networking Options -->
+     QoS and/or fair queuing -->
+        Network emulator
+
+[If it has been compiled as a module, then do a "modprobe sch_netem".]
+
+On FreeBSD, dummynet (<http://info.iet.unipi.it/~luigi/ip_dummynet>):
+
+ipfw add 1000 pipe 1 tcp from judith to kiwi echo
+ipfw pipe 1 config plr 0.5
+
+It works fine to test echoping with 50 % of loss.
+
+(In French, see
+http://www.bortzmeyer.org/tester-protocoles-reseaux-avec-pertes.html)
+
 
 $Id$

SRC/DEVELOPERS

@@ -0,0 +1,20 @@
+This file stores a few small tips for developers.
+
+=== Starting from a fresh copy ===
+
+When you have just retrieved echoping via Subversion (this does not
+apply to regular tarballs), you must first create all the files
+required by the autotools. You need these autotools (autoconf,
+automake and libtool) and then:
+
+./recreate-autofiles
+
+=== Merging from a maintenance branch back into the trunk ===
+
+If you have fixed bugs in a branch and want to merge them into the
+trunk as well:
+
+cd /where/is/the/trunk
+svn merge -r N:M ../branches/MAINT_X_Y
+
+$Id$

SRC/INSTALL

@@ -1,10 +1,16 @@
 echoping appears to compile and run at least on Linux, FreeBSD,
-Solaris (gcc only) and Tru64. On Mac OS X, you'll probably need a
-version >= 10.2. You do not have to be root to install it.
+NetBSD, MacOS X, Solaris (gcc only) and Tru64. On Mac OS X, you'll
+probably need a version >= 10.2. Some versions of RedHat 7 ship with a
+completely broken C compiler (echoping displays negative times).
+
+You do not have to be root to install it.
 
 Just type "./configure", then "make", "make test" if you wish (some
 tests depend on local servers and/or Internet access, interpret with
-care) and then (as root if necessary), "make install".
+care) and then (as root if necessary), "make install". Since
+echoping's configure script is quite slow, it is highly recommended to
+use --config-cache or to have a config.site where it is the default
+(see autoconf documentation).
 
 There is also a 'make fulltest' if you want to test more things (which
 may not be available on your platform).
@@ -13,17 +19,52 @@ may not be available on your platform).
 --disable-http (suppress the HTTP support)
 --disable-smtp (suppress the SMTP support)
 --enable-icp   (add the ICP support, to monitor Web proxies like Squid)
+--without-libidn   (suppress the IDN support, the handling of Unicode - multi-script - domain names, see RFC 3490)
+--with-libidn[=/where/is/libidn] (tell the system where to find the GNU libidn library <http://www.josefsson.org/libidn/>)
+--with-gnutls[=/where/is/gnutls] (add the SSL/TLS support, you will need 
+         the GNU TLS library <http://www.gnutls.org/>)
 --with-ssl[=/where/is/ssl] (add the SSL/TLS support, you will need 
          the OpenSSL library <http://www.openssl.org/>)
---disable-ttcp  (suppress the T/TCP support which is enabled only if 
-         your system supports it - FreeBSD does. See 
-         <http://www.kohala.com/start/ttcp.html>)
+--enable-max-iterations=MAX   (limit the number of iterations (-n option for
+          repeated tests) to MAX)
+--enable-max-request-size=MAX   (limit the size of the request (-s option) to MAX)
+--enable-plugin=LIST (list of plugins to build)
 
 There is no option to disable IPv6. echoping now uses the new (RFC
-2133) socket interface, with getnameinfo/getaddrinfo. If your system
-does not support it (Mac OS X), you jave no other choices than using
+3493, but first specified in RFC 2133 in september 1997) socket
+interface, with getnameinfo/getaddrinfo. If your system does not
+support it (Mac OS X <= 10.1), you have no other choices than using
 echoping 4.
 
+There is no option to disable the use of dlopen() or the popt
+library. dlopen() is necessary for the plugins (and, in the future,
+all protocol code will be in plugins). The popt library provides a
+better and easier parsing of options and, more important, is necessary
+for resuming parsing, something that the plugins rely heavily on.  If
+your system does not support dlopen() or if you do not want to install
+the popt library (which is free and runs on every Unix), you have no
+other choices than using echoping 5. popt can be retrieved from, for
+instance, ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-1.7.tar.gz or
+ask Freshmeat at http://freshmeat.net/projects/popt/.
+
+If, on a 64bits machine such as one using AMD Opteron, compilation
+stops with something like:
+
+/usr/lib/libpopt.so: could not read symbols: File in wrong format
+
+it could mean that popt was compiled only in 32bits. Recompile popt
+(warning: other applications may use it) or compile and keep two popt
+(practical details on how to keep two versions are welcome) or compile
+echoping in 32bits. With gcc:
+
+CFLAGS=-m32 ./configure --config-cache
+make
+
+If your make program is not in the PATH (for instance, on Solaris, it
+is typically installed in /usr/ccs/bin/make), the simplest trick is:
+
+./configure --config-cache MAKE=/your/path/to/make
+
 Standard "autoconf/configure" options are supported such as --prefix
 to set the installation root directory.
 
@@ -32,10 +73,24 @@ check first that you use the FQDN of the server on the command line
 (this is a consequence of the HTTP 1.1 protocol, not a bug in echoping
 and this will show only if the HTTP server uses "virtual hosting").
 
+The SSL support (with OpenSSL *or* GNU TLS) is not established by
+default, mostly because cryptography software's status is still
+unclear in some countries. You have to use --with-ssl (which should be
+--with--openssl, I know, there are two libraries, with incompatible
+APIs) or --with-gnutls
+
+************* Bug reports ***********************
+
 To report a bug, email Stephane Bortzmeyer
 <bortz@users.sourceforge.net> (if you have an account at SourceForge,
-you can use their bug reporting tool, too). If the problem is at the
-"./configure" step, do not forget to send the config.log.
+you can use their bug reporting tool, too, at
+http://sourceforge.net/tracker/?group_id=4581&atid=104581).
+
+If the problem is at the "./configure" step, do not forget to send
+configure's output *and* the config.log.
+
+If the problem is at run-time, please send the output of "echoping -V"
+(capital V).
 
 If echoping segfaults, please send me debugging info. To do so:
 make clean
@@ -43,8 +98,25 @@ make debug
 gdb ./echoping
 run the-options-that-exhibits-the-problem
 where
+list
 print the-variables-displayed
 
+********** System-specific notes **************
+
+HP-UX: echoping probably cannot run because it depends on a feature
+called "back-linking" (the main program must be able to export its
+symbols to the plugins, and not only the other way around). HP-UX is
+apparently the only Unix without it (see libtool documentation). No
+solution yet.
+
+FreeBSD: popt is a port, so "pkg_add -r popt" will work (or
+"portinstall popt").
+
+NetBSD: popt is a port, so "pkg_add popt" will work.
+
+Debian: echoping is a Debian package so you typically do not need to
+compile it. If you want to do it, do not forget to install the
+development versions of the libraries ("apt-get install libpopt-dev").
 
 $Id$
 

SRC/Makefile.am

@@ -5,15 +5,23 @@
 bin_PROGRAMS = echoping
 man_MANS = echoping.1
 echoping_SOURCES = echoping.c error.c readline.c writen.c util.c http.c icp.c HTParse.c echoping.h icp.h HTParse.h smtp.c
+pkginclude_HEADERS = echoping.h compilation.h
 echoping_LDADD = 
-DOCS=DETAILS
+echoping_LDFLAGS = -export-dynamic
+DOCS=DETAILS PLUGINS
+SUBDIRS=plugins
+SVN_REPO=http://echoping.svn.sourceforge.net/svnroot/echoping
 
 TESTS=test-echoping-local test-echoping-remote 
-MORE_TESTS=test-echoping-proxy test-echoping-icp test-echoping-crypto test-echoping-tos test-echoping-ipv6
+MORE_TESTS=test-echoping-proxy test-echoping-icp test-echoping-crypto test-echoping-tos test-echoping-ipv6 test-echoping-idn test-echoping-plugins
 
-test: check
+test: tests
 tests: check
 
+# TODO: raise a warning at install-time when the prefix changes (just
+# a warning because we do not want to prevent Debian packages for
+# being built), otherwise, the plugins will not be found.
+
 fulltest: test moretest
 
 moretests: moretest
@@ -51,18 +59,22 @@ internal_tests: internal_tests.o $(echoping_OBJECTS)
 debug: 
 	$(MAKE) DEBUG=1 CFLAGS='-g -O0'
 
-upload: dist
-	@echo "Have you updated ChangeLog and tagged (cvs tag RELEASE_x_x_x) everything?"
+upload: 
+	@echo "Have you updated configure-common.ac and ChangeLog and committed?"
+	@echo "Then, have you ran \"make distcheck\" and tagged everything?"
+	@echo "[Tag is 'svn copy -m \"TAG Release x.y.z\" ${SVN_REPO}/trunk ${SVN_REPO}/tags/RELEASE_x_y_z']"
 	@echo "If so, make upload-force"
 
 upload-force: dist
-	scp $(distdir).tar.gz  bortzmeyer@ftp.internatif.org:'~ftp/pub/unix/echoping'
 	rm -f upload.log
 	ncftpput -d upload.log upload.sourceforge.net /incoming $(distdir).tar.gz
 
+realclean: distclean
+	rm -rf *~ autom4te.cache
+
 EXTRA_DIST = $(man_MANS) $(TESTS) $(DOCS) $(MORE_TESTS)
 
-## Otherwise, we depend on GNUmake, but for CVS users, not for regular
+## Otherwise, we depend on GNUmake, but for Subversion users, not for regular
 ## tarball users
 ##AUTOMAKE_OPTIONS = no-dependencies
 

SRC/Makefile.in

@@ -1,520 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# $Id$
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-CC = @CC@
-MAKEINFO = @MAKEINFO@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-bin_PROGRAMS = echoping
-man_MANS = echoping.1
-echoping_SOURCES = echoping.c error.c readline.c writen.c util.c http.c icp.c HTParse.c echoping.h icp.h HTParse.h smtp.c
-echoping_LDADD = 
-DOCS = DETAILS
-
-TESTS = test-echoping-local test-echoping-remote 
-MORE_TESTS = test-echoping-proxy test-echoping-icp test-echoping-crypto test-echoping-tos test-echoping-ipv6
-
-EXTRA_DIST = $(man_MANS) $(TESTS) $(DOCS) $(MORE_TESTS)
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-echoping_OBJECTS =  echoping.o error.o readline.o writen.o util.o http.o \
-icp.o HTParse.o smtp.o
-echoping_DEPENDENCIES = 
-echoping_LDFLAGS = 
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-man1dir = $(mandir)/man1
-MANS = $(man_MANS)
-
-NROFF = nroff
-DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
-Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 \
-config.guess config.h.in config.sub configure configure.in install-sh \
-missing mkinstalldirs
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-DEP_FILES =  .deps/HTParse.P .deps/echoping.P .deps/error.P .deps/http.P \
-.deps/icp.P .deps/readline.P .deps/smtp.P .deps/util.P .deps/writen.P
-SOURCES = $(echoping_SOURCES)
-OBJECTS = $(echoping_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4):  configure.in  acinclude.m4
-	cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-config.h: stamp-h
-	@if test ! -f $@; then \
-		rm -f stamp-h; \
-		$(MAKE) stamp-h; \
-	else :; fi
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
-	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f config.h
-
-maintainer-clean-hdr:
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-	done
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-echoping: $(echoping_OBJECTS) $(echoping_DEPENDENCIES)
-	@rm -f echoping
-	$(LINK) $(echoping_LDFLAGS) $(echoping_OBJECTS) $(echoping_LDADD) $(LIBS)
-
-install-man1:
-	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-	done
-
-uninstall-man1:
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
-	done
-install-man: $(MANS)
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-man1
-uninstall-man:
-	@$(NORMAL_UNINSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-check-TESTS: $(TESTS)
-	@failed=0; all=0; \
-	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f $$tst; then dir=.; \
-	  else dir="$(srcdir)"; fi; \
-	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
-	    all=`expr $$all + 1`; \
-	    echo "PASS: $$tst"; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    failed=`expr $$failed + 1`; \
-	    echo "FAIL: $$tst"; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  banner="All $$all tests passed"; \
-	else \
-	  banner="$$failed of $$all tests failed"; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-all-recursive-am: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-install-exec-am: install-binPROGRAMS
-install-exec: install-exec-am
-
-install-data-am: install-man
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-binPROGRAMS uninstall-man
-uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS) $(MANS) config.h
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
-		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
-		distclean-tags distclean-depend distclean-generic \
-		clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-depend maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile install-man1 uninstall-man1 install-man \
-uninstall-man tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
-clean-depend maintainer-clean-depend check-TESTS info-am info dvi-am \
-dvi check check-am installcheck-am installcheck all-recursive-am \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-test: check
-tests: check
-
-fulltest: test moretest
-
-moretests: moretest
-moretest: $(MORE_TESTS)
-	@failed=0; all=0; \
-	srcdir=$(srcdir); export srcdir; \
-	for tst in $(MORE_TESTS); do \
-	  if test -f $$tst; then dir=.; \
-	  else dir="$(srcdir)"; fi; \
-	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
-	    all=`expr $$all + 1`; \
-	    echo "PASS: $$tst"; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    failed=`expr $$failed + 1`; \
-	    echo "FAIL: $$tst"; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  banner="All $$all tests passed"; \
-	else \
-	  banner="$$failed of $$all tests failed"; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
-
-internal_test: internal_tests
-internal_tests: internal_tests.o $(echoping_OBJECTS)
-	$(CC) $(LDFLAGS) -o $@ $< util.o 
-	./internal_tests
-
-debug: 
-	$(MAKE) DEBUG=1 CFLAGS='-g -O0'
-
-upload: dist
-	@echo "Have you updated ChangeLog and tagged (cvs tag RELEASE_x_x_x) everything?"
-	@echo "If so, make upload-force"
-
-upload-force: dist
-	scp $(distdir).tar.gz  bortzmeyer@ftp.internatif.org:'~ftp/pub/unix/echoping'
-	rm -f upload.log
-	ncftpput -d upload.log upload.sourceforge.net /incoming $(distdir).tar.gz
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

SRC/PLUGINS

@@ -0,0 +1,63 @@
+If you want to write your own plugins, you will first have to decide
+wether your plugin uses a "cooked" hostname or a "raw" one.
+
+In the first case, the cooked hostname, your plugin will receive from
+echoping a struct addrinfo. All the DNS stuff, including IDN, is
+performed by echoping. You can immediately start using the struct
+addrinfo.
+
+But some libraries (typically, the one used by the DBMSs) do not work
+on struct addrinfo but on strings such as "dbname=test
+hostname=foo.bar". Plugins using these libraries will have to use the
+raw interface. The host name given as argument is ignored.
+
+[Do note there is *no* interface where the TCP connection and shutdown
+are done by echoping. (See bug #1694510) They are always performed by
+the plugin.]
+
+You indicate to echoping wether you use the raw interface or the
+cooked one by returning a port name or NULL from the init() function.
+
+You will have to provide three functions:
+
+char * init (const int argc, const char **argv, const echoping_options options)) 
+  Accepts remaining arguments (you have to use popt to parse them, or do
+  it by hand, getopt does not allow you to resume the parsing) and
+  returns a string identifying the port name (cooked interface) or NULL
+  (raw interface). The options struct will give you the global options
+  (see echoping.h).
+
+For the cooked interface:
+
+void start (struct addrinfo *res)
+  Typically just stores the res structure for later use.
+
+For the raw interface:
+
+void start_raw ()
+  Typically connects to the server.
+
+int execute ()
+  Connects and do whatever the protocol requires. It is called once
+  per iteration. It returns >=0 if it succeeds, -1 if it failed
+  temporarily (so echoping will continue its loop) and -2 if it failed
+  permanently (so echoping will stop the iteration).
+
+void terminate ()
+  Cleans everything. It is called after all iterations.
+
+Start your plugin source code with:
+
+#define IN_PLUGIN
+#include <echoping/echoping.h>
+
+You can look at random.c, the simplest plugin, and whois.c, the
+simplest which still does something useful.
+
+The documentation of the plugin should be in a manual page named
+echoping_PLUGINNAME. See the above plugins for examples.
+
+You can write a shell script named test.sh in the plugin directory to
+test the plugin. test-echoping-plugins will execute it.
+
+$Id$

SRC/README

@@ -20,12 +20,13 @@ test hosts which aren't yours.
 
 Current features:
 
-- uses the protocols echo, discard, chargen, HTTP (with SSL if you 
+- uses the protocols echo, discard, chargen, HTTP (with SSL/TLS if you
   wish), ICP or SMTP,
 - uses UDP instead of TCP for the protocols which accept it (like echo), 
 - can repeat the test and display various measures about it,
 - supports IPv6 as well as IPv4,
-- can use T/TCP on systems which support it.
+- supports IDN (Unicode domain names),
+- supports plugins written by you, to test even more protocols (see PLUGINS),
 
 Examples of output:
 
@@ -63,10 +64,28 @@ http://echoping.sourceforge.net/
 
 The distribution is from:
 
-ftp://ftp.internatif.org/pub/unix/echoping
+http://sourceforge.net/project/showfiles.php?group_id=4581
 
 Stephane Bortzmeyer <bortz@users.sourceforge.net>. October 1995 for the
-first version. October 2002 for this one.
+first version. 
+
+--------------------- 
+If you want to help and/or motivate echoping and its developer, you
+can (but are not forced to do so, echoping is free software):
+
+* Give money through Sourceforge's donation system
+  (http://sourceforge.net/project/project_donations.php?group_id=4581)
+
+* Use my Amazon's wish list
+  (http://www.amazon.com/gp/registry/23ELBV1YZ93SC)
+
+* Send me a postcard. I love postcards:
+       Stephane Bortzmeyer
+       127, rue Brancion
+       75015 Paris
+       France
+
+
 
 $Id$
 

SRC/TODO

@@ -1,10 +1,10 @@
 Actual bugs are registered at SourceForge:
 
-http://sourceforge.net/bugs/?group_id=4581
+http://sourceforge.net/tracker/?group_id=4581&atid=104581
 
 To see a given bug (say #132001):
 
-http://sourceforge.net/bugs/?group_id=4581&func=detailbug&bug_id=132001
+http://sourceforge.net/tracker/index.php?func=detail&aid=132001&group_id=4581&atid=104581
 
 -------------------------------------
 
@@ -16,38 +16,17 @@ is interesting, too.
 
 Wishes:
 
-Display other calculations such as kurtosis.
+See them at Sourceforge :
 
-Check the TCP timeout with T/TCP. Difficult to test, few T/TCP
-machines exist. Timeouts on T/TCP connections are a bit experimental.
+http://sourceforge.net/tracker/?group_id=4581&atid=354581
 
-TCP timeout with long packets seem to confuse Cisco routers. Does
-someone can reproduce it and perform tests? It seems to work now.
 
-Do not display the end-of-line after the HTTP reply, for instance when
-a page is moved.
 
-UDP isn't really useable with large packets because of sockets
-limitations and the lack of workaround code.
-
-If a Web page is empty, echoping will display meaningless messages.
-
-Since echoping writes everything to the server, then begins to read
-the reply, some echo servers will timeout if you send very long
-messages, because they expect you to start to read right now.
-
-Make FLUSH a configure-able option.
+$Id$
 
-Compiler's warnings:
 
-1) Tru64's cc:
-cc -DHAVE_CONFIG_H -I. -I. -I.   -D_POSIX_PII_SOCKET  -g -c icp.c
-cc: Warning: icp.c, line 92: In this statement, the referenced type of the pointer value "(int ...)0" is "int", which is not compatible with "unsigned long". (ptrmismatch)
-  nr = recvfrom (sockfd, buf, DEFLINE, 0, (struct sockaddr *) 0, (int *) 0);
------------------------------------------------------------------^
 
 
-$Id$
 
 
 

SRC/acconfig.h

@@ -1,45 +0,0 @@
-@BOTTOM@
-
-/* Do we have getaddrinfo()? */
-#undef HAVE_GETADDRINFO_PROTO
-
-/* Do we have POSIX signals? */
-#undef HAVE_SIGACTION
-
-/* Do we have T/TCP? */
-#undef HAVE_TTCP
-
-/* Do we have TOS? */
-#undef HAVE_TOS
-
-/* Do we have socket priority? */
-#undef HAVE_SOCKET_PRIORITY
-
-/* Is sys_errlist declared? */
-#undef DECL_SYS_ERRLIST
-
-/* Is sys_nerr declared? */
-#undef DECL_SYS_NERR
-
-/* HTTP support */
-#undef HTTP 
-
-/* SMTP support */
-#undef SMTP
-
-/* ICP support */
-#undef ICP 
-
-/* SSL (crypto) */
-#undef OPENSSL
-
-/* Port name for HTTP. Unused. */
-#undef HTTP_TCP_PORT
-
-/* Port name for ICP */
-#undef ICP_UDP_PORT
-
-#undef PACKAGE
-#undef VERSION
-
-/* $Id$ */

SRC/acinclude.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 
-dnl Macros beginning with CF_ stolen from Lynx
+dnl Macros beginning with CF_ (mostly) stolen from Lynx
 dnl Thanks to "T.E.Dickey" <dickey@clark.net>
 
 dnl ---------------------------------------------------------------------------
@@ -78,18 +78,6 @@ fi
 CF_CHECK_EXTERN_DATA($1,int)
 ])dnl
 
-dnl ---------------------------------------------------------------------------
-dnl Check for declaration of sys_nerr and sys_errlist in one of stdio.h and
-dnl errno.h.  Declaration of sys_errlist on BSD4.4 interferes with our
-dnl declaration.  Reported by Keith Bostic.
-AC_DEFUN([CF_SYS_ERRLIST],
-[
-for cf_name in sys_nerr sys_errlist
-do
-    CF_CHECK_ERRNO($cf_name)
-done
-])dnl
-
 dnl Useful macros to check libraries which are not implicit 
 dnl in Solaris, for instance.
 AC_DEFUN([CF_LIB_NSL],
@@ -138,7 +126,6 @@ AC_TRY_LINK([#include <math.h>
 ]) 
 ])
 
-
 dnl Check the port name for HTTP. Everyone should declare "http" but
 dnl not everyone does. This test is BUGgy, we should use a program
 dnl which calls getservbyname() otherwise we miss NIS tables, for
@@ -170,6 +157,15 @@ else
 fi
 ])
 
+# Check GNU libidn
+# TODO: check the patched libc with AI_IDN. See libidn, in libc/getaddrinfo-idn.txt.
+AC_DEFUN([CF_LIB_LIBIDN],
+[
+AC_CHECK_LIB(idn,idna_to_ascii_8z,
+[LIBS="${LIBS} -lidn"],
+[AC_ERROR([Get the GNU libidn library (http://www.josefsson.org/libidn/) in order to use Unicode - multi-script - domain names or use --without-libidn to disable it])], dnl
+)])
+
 # Check OpenSSL
 AC_DEFUN([CF_LIB_OPENSSL],
 [
@@ -179,6 +175,14 @@ AC_CHECK_LIB(ssl,SSL_CTX_new,
 -lcrypto
 )])
 
+# Check GNU TLS
+AC_DEFUN([CF_LIB_GNUTLS],
+[
+AC_CHECK_LIB(gnutls,gnutls_global_init,
+[LIBS="${LIBS} `libgnutls-config --libs`"],
+[AC_ERROR([Get the GNU TLS library (http://www.gnutls.org/)])], dnl
+)])
+
 dnl experimental
 AC_DEFUN([CF_CHECK_TCP_SERVICE],
 [
@@ -210,7 +214,7 @@ ac_last_port=
 
 dnl Our (W. Richard Stevens') macro to check for a function prototype in 
 dnl a given header.  
-AC_DEFUN(AC_CHECK_FUNC_PROTO,
+AC_DEFUN([AC_CHECK_FUNC_PROTO],
         [AC_CACHE_CHECK(for $1 function prototype in $2, ac_cv_have_$1_proto,
                 AC_EGREP_HEADER($1, $2,
                         ac_cv_have_$1_proto=yes,
@@ -224,7 +228,7 @@ AC_DEFUN(AC_CHECK_FUNC_PROTO,
 dnl BROKEN: do not use
 dnl Copied from autoconf and edited to add an argument: an include file
 dnl AC_CHECK_FUNC_WITH_HEADER(FUNCTION, HEADER, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-AC_DEFUN(AC_CHECK_FUNC_WITH_HEADER,
+AC_DEFUN([AC_CHECK_FUNC_WITH_HEADER],
 [AC_MSG_CHECKING([for $1])
 AC_CACHE_VAL(ac_cv_func_$1,
 [AC_TRY_LINK(

SRC/aclocal.m4

@@ -1,394 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p4
-
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl $Id$
-
-dnl Macros beginning with CF_ stolen from Lynx
-dnl Thanks to "T.E.Dickey" <dickey@clark.net>
-
-dnl ---------------------------------------------------------------------------
-dnl Make an uppercase version of a variable
-dnl $1=uppercase($2)
-AC_DEFUN([CF_UPPER],
-[
-changequote(,)dnl
-$1=`echo $2 | tr '[a-z]' '[A-Z]'`
-changequote([,])dnl
-])dnl
-
-dnl ---------------------------------------------------------------------------
-dnl Check for existence of external data in the current set of libraries.  If
-dnl we can modify it, it's real enough.
-dnl $1 = the name to check
-dnl $2 = its type
-AC_DEFUN([CF_CHECK_EXTERN_DATA],
-[
-AC_MSG_CHECKING(if external $1 exists)
-AC_CACHE_VAL(cf_cv_have_$1,[
-    AC_TRY_LINK([
-#undef $1
-extern $2 $1;
-],
-    [$1 = 2],
-    [eval 'cf_cv_have_'$1'=yes'],
-    [eval 'cf_cv_have_'$1'=no'])])
-
-eval 'cf_result=$cf_cv_have_'$1
-AC_MSG_RESULT($cf_result)
-
-if test "$cf_result" = yes ; then
-    eval 'cf_result=HAVE_'$1
-    CF_UPPER(cf_result,$cf_result)
-    AC_DEFINE_UNQUOTED($cf_result)
-fi
-
-])dnl
-
-dnl ---------------------------------------------------------------------------
-dnl Check for data that is usually declared in <stdio.h> or <errno.h>, e.g.,
-dnl the 'errno' variable.  Define a DECL_xxx symbol if we must declare it
-dnl ourselves.
-dnl
-dnl (I would use AC_CACHE_CHECK here, but it will not work when called in a
-dnl loop from CF_SYS_ERRLIST).
-dnl
-dnl $1 = the name to check
-AC_DEFUN([CF_CHECK_ERRNO],
-[
-AC_MSG_CHECKING(if external $1 is declared)
-AC_CACHE_VAL(cf_cv_dcl_$1,[
-    AC_TRY_COMPILE([
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#include <stdio.h>
-#include <sys/types.h>
-#include <errno.h> ],
-    [long x = (long) $1],
-    [eval 'cf_cv_dcl_'$1'=yes'],
-    [eval 'cf_cv_dcl_'$1'=no]')
-])
-eval 'cf_result=$cf_cv_dcl_'$1
-AC_MSG_RESULT($cf_result)
-
-if test "$cf_result" = no ; then
-    eval 'cf_result=DECL_'$1
-    CF_UPPER(cf_result,$cf_result)
-    AC_DEFINE_UNQUOTED($cf_result)
-fi
-
-# It's possible (for near-UNIX clones) that the data doesn't exist
-CF_CHECK_EXTERN_DATA($1,int)
-])dnl
-
-dnl ---------------------------------------------------------------------------
-dnl Check for declaration of sys_nerr and sys_errlist in one of stdio.h and
-dnl errno.h.  Declaration of sys_errlist on BSD4.4 interferes with our
-dnl declaration.  Reported by Keith Bostic.
-AC_DEFUN([CF_SYS_ERRLIST],
-[
-for cf_name in sys_nerr sys_errlist
-do
-    CF_CHECK_ERRNO($cf_name)
-done
-])dnl
-
-dnl Useful macros to check libraries which are not implicit 
-dnl in Solaris, for instance.
-AC_DEFUN([CF_LIB_NSL],
-[
-AC_CHECK_LIB(nsl,gethostbyname,
-[
-AC_MSG_CHECKING(if libnsl is mandatory)
-AC_TRY_LINK([#include <sys/types.h>
-             #include <netinet/in.h>
-             char *domain;  ], 
- [gethostbyname(domain)], dnl
- [AC_MSG_RESULT(no)], dnl
- [AC_MSG_RESULT(yes); LIBS="${LIBS} -lnsl"])
-]) 
-])
-AC_DEFUN([CF_LIB_SOCKET],
-[
-AC_CHECK_LIB(socket,socket,
-[
-AC_MSG_CHECKING(if libsocket is mandatory)
-AC_TRY_LINK([#include <sys/types.h>
-             #include <netinet/in.h>
-             union
-             {
-                HEADER hdr;
-                u_char buf[512];
-             }
-             response;
-             char *domain;
-             int requested_type;        ], 
- [socket (AF_INET, SOCK_STREAM, 0) ], dnl
- [AC_MSG_RESULT(no)], dnl
- [AC_MSG_RESULT(yes); LIBS="${LIBS} -lsocket"]) 
-])
-])
-AC_DEFUN([CF_LIB_MATH],
-[
-AC_CHECK_LIB(m,pow,
-[
-AC_MSG_CHECKING(if libmath is mandatory)
-AC_TRY_LINK([#include <math.h>
-             double a,b;  ], 
- [pow(a,b)], dnl
- [AC_MSG_RESULT(no)], dnl
- [AC_MSG_RESULT(yes); LIBS="${LIBS} -lm"])
-]) 
-])
-
-
-dnl Check the port name for HTTP. Everyone should declare "http" but
-dnl not everyone does. This test is BUGgy, we should use a program
-dnl which calls getservbyname() otherwise we miss NIS tables, for
-dnl instance.
-AC_DEFUN([CF_CHECK_SERVICES],
-[
-AC_MSG_CHECKING(what is the name of the HTTP port in your services database)
-dnl BUG: We should test it is really the good port and not any mention of "http"
-if grep http /etc/services > /dev/null; then
-    AC_DEFINE(HTTP_TCP_PORT,"http")
-    AC_MSG_RESULT(http)
-else
-    dnl BUG: Trap on Solaris with a port whose name begins with "www"...
-    if grep www /etc/services > /dev/null; then
-	AC_DEFINE(HTTP_TCP_PORT,"www")
-        AC_MSG_RESULT(www)	
-    else
-	AC_DEFINE(HTTP_TCP_PORT,"undefined:use_:80")
-	AC_MSG_RESULT([undefined, you should add it in your database])
-    fi
-fi
-AC_MSG_CHECKING(what is the name of the ICP port in your services database)
-if grep icp /etc/services > /dev/null; then
-    AC_DEFINE(ICP_UDP_PORT,"icp")
-    AC_MSG_RESULT(icp)
-else
-    AC_DEFINE(ICP_UDP_PORT,"undefined:use_:3130")
-    AC_MSG_RESULT([undefined, you should add it in your database])
-fi
-])
-
-# Check OpenSSL
-AC_DEFUN([CF_LIB_OPENSSL],
-[
-AC_CHECK_LIB(ssl,SSL_CTX_new,
-[LIBS="${LIBS} -lssl -lcrypto"],
-[AC_ERROR([Get the OpenSSL library (http://www.openssl.org/)])], dnl
--lcrypto
-)])
-
-dnl experimental
-AC_DEFUN([CF_CHECK_TCP_SERVICE],
-[
-AC_TRY_RUN([
-#include        <stdio.h>
-#include        <stdlib.h>
-#include        <sys/types.h>
-#include        <netdb.h>
-#include        <sys/socket.h>
-#include        <netinet/in.h>
-#include        <arpa/inet.h>
-#include        <unistd.h>
-int 
-main (argc, argv)
-     int argc;
-     char *argv[];
-{
-  struct servent *sp;
-  if ((sp = getservbyname ("$1", "tcp")) == 0)
-	exit (1);
-  else
-	exit (0);
-} 
-],
-ac_last_port=$1
-,
-ac_last_port=
-)])
-
-dnl Our (W. Richard Stevens') macro to check for a function prototype in 
-dnl a given header.  
-AC_DEFUN(AC_CHECK_FUNC_PROTO,
-        [AC_CACHE_CHECK(for $1 function prototype in $2, ac_cv_have_$1_proto,
-                AC_EGREP_HEADER($1, $2,
-                        ac_cv_have_$1_proto=yes,
-                        ac_cv_have_$1_proto=no))
-        if test $ac_cv_have_$1_proto = yes ; then
-                ac_tr_func=HAVE_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
-                AC_DEFINE_UNQUOTED($ac_tr_func)
-        fi
-])
-
-dnl BROKEN: do not use
-dnl Copied from autoconf and edited to add an argument: an include file
-dnl AC_CHECK_FUNC_WITH_HEADER(FUNCTION, HEADER, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-AC_DEFUN(AC_CHECK_FUNC_WITH_HEADER,
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(ac_cv_func_$1,
-[AC_TRY_LINK(
-dnl Don't include <ctype.h> because on OSF/1 3.0 it includes <sys/types.h>
-dnl which includes <sys/select.h> which contains a prototype for
-dnl select.  Similarly for bzero.
-[/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $1(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-extern "C"
-#endif
-])dnl
-[/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $1();
-#include <$2>
-], [
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$1) || defined (__stub___$1)
-choke me
-#else
-$1();
-#endif
-], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")])
-if eval "test \"`echo '$ac_cv_func_'$1`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  ifelse([$3], , :, [$3])
-else
-  AC_MSG_RESULT(no)
-ifelse([$4], , , [$4
-])dnl
-fi
-])
-
-
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-

SRC/compilation.h.in

@@ -0,0 +1,3 @@
+#define COMPILATION_OPTIONS "@PACKAGE_NAME@ @PACKAGE_VERSION@ compiled with @CC@ on @hostname@ (@host@)\n at @compil_date@ with options:\nCFLAGS= @CFLAGS@\nLDFLAGS= @LDFLAGS@\n@compil_options@\n\nPlugins are searched in @plugins_dir@."
+
+/* $Id$ */

SRC/config.h.in

@@ -1,97 +0,0 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
-
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define if you don't have vprintf but do have _doprnt.  */
-#undef HAVE_DOPRNT
-
-/* Define if you have the vprintf function.  */
-#undef HAVE_VPRINTF
-
-/* Define as the return type of signal handlers (int or void).  */
-#undef RETSIGTYPE
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#undef TIME_WITH_SYS_TIME
-
-/* Define if you have the getaddrinfo function.  */
-#undef HAVE_GETADDRINFO
-
-/* Define if you have the getnameinfo function.  */
-#undef HAVE_GETNAMEINFO
-
-/* Define if you have the gettimeofday function.  */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define if you have the inet_ntop function.  */
-#undef HAVE_INET_NTOP
-
-/* Define if you have the sigaction function.  */
-#undef HAVE_SIGACTION
-
-/* Define if you have the socket function.  */
-#undef HAVE_SOCKET
-
-/* Define if you have the usleep function.  */
-#undef HAVE_USLEEP
-
-/* Define if you have the <sys/time.h> header file.  */
-#undef HAVE_SYS_TIME_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Version number of package */
-#undef VERSION
-
-
-/* Do we have getaddrinfo()? */
-#undef HAVE_GETADDRINFO_PROTO
-
-/* Do we have POSIX signals? */
-#undef HAVE_SIGACTION
-
-/* Do we have T/TCP? */
-#undef HAVE_TTCP
-
-/* Do we have TOS? */
-#undef HAVE_TOS
-
-/* Do we have socket priority? */
-#undef HAVE_SOCKET_PRIORITY
-
-/* Is sys_errlist declared? */
-#undef DECL_SYS_ERRLIST
-
-/* Is sys_nerr declared? */
-#undef DECL_SYS_NERR
-
-/* HTTP support */
-#undef HTTP 
-
-/* SMTP support */
-#undef SMTP
-
-/* ICP support */
-#undef ICP 
-
-/* SSL (crypto) */
-#undef OPENSSL
-
-/* Port name for HTTP. Unused. */
-#undef HTTP_TCP_PORT
-
-/* Port name for ICP */
-#undef ICP_UDP_PORT
-
-#undef PACKAGE
-#undef VERSION
-
-/* $Id$ */

SRC/configure-common.ac

@@ -0,0 +1,8 @@
+dnl $Id$
+AC_INIT(echoping, 6.1-BETA, bortz@users.sourceforge.net)
+AC_CANONICAL_HOST
+AC_PROG_CC(cc gcc)
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
+
+

SRC/configure.ac

@@ -0,0 +1,383 @@
+dnl $Id$
+
+dnl Process this file with autoconf to produce a configure script.
+
+m4_include(configure-common.ac)
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER(config.h)
+
+dnl Checking size of ints, we often need it for binary protocols like ICP
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+
+dnl User options
+dnl http://sources.redhat.com/ml/automake-prs/2001-q3/msg00033.html
+max_iterations_specified=0
+AC_ARG_ENABLE(max-iterations,
+[  --enable-max-iterations=MAX   limit the number of iterations (-n option) to MAX],
+[if test "$enableval" != "no"; then
+   max_iterations_specified=1
+fi])
+if test "$max_iterations_specified" = 0; then
+   AC_DEFINE(MAX_ITERATIONS, 20, Maximum number of iterations)
+else
+   AC_DEFINE_UNQUOTED(MAX_ITERATIONS, $enableval, Maximum number of iterations)
+fi
+max_line_specified=0
+AC_ARG_ENABLE(max-request-size,
+[  --enable-max-request-size=MAX   limit the size of a request to MAX],
+[if test "$enableval" != "no"; then
+   max_line_specified=1
+fi])
+if test "$max_line_specified" = 0; then
+  AC_DEFINE(MAX_LINE, 65535, Maximum size of a request)
+else
+   AC_DEFINE_UNQUOTED(MAX_LINE, $enableval, Maximum size of a request)
+fi
+AC_ARG_ENABLE(http,
+ [  --enable-http   HTTP (Web's main protocol) support],dnl
+ [if test "$enableval" = "yes"; then
+ AC_DEFINE(HTTP,,[HTTP support])
+ HTTP=1
+ fi],
+ dnl Default: enable it
+ [AC_DEFINE(HTTP,,[HTTP support])
+  HTTP=1])
+AC_ARG_ENABLE(icp,
+ [  --enable-icp   ICP (for testing Web proxies/caches) support],dnl
+ [if test "$enableval" = "yes"; then
+ AC_DEFINE(ICP,,[ICP support])
+ ICP=1
+ fi])
+AC_ARG_ENABLE(smtp,
+ [  --enable-smtp   SMTP (Mail's main protocol) support],dnl
+ [if test "$enableval" = "yes"; then
+ AC_DEFINE(SMTP,,[SMTP support])
+ SMTP=1
+ fi],
+ dnl Default: enable it
+ [AC_DEFINE(SMTP,,[SMTP support])
+  SMTP=1])
+dnl IDN
+dnl Default: enable it	
+LIBIDN=1
+AC_ARG_WITH(libidn,
+ [  --with-libidn[=DIR]   Internationalized Domain Names support (needs GNU libidn)],dnl
+ [if test "$withval" != "no"; then
+   if test "$withval" != "yes"; then
+	IDNROOT=$withval
+	LDFLAGS="${LDFLAGS} -L$IDNROOT/lib"
+        CPPFLAGS="${CPPFLAGS} -I$IDNROOT/include"  
+   fi
+ else
+   LIBIDN=0
+ fi],
+)
+if test "$LIBIDN" = "1"; then
+AC_DEFINE(LIBIDN,,[Internationalized Domain Names support])
+fi
+AC_ARG_WITH(ssl,
+ [  --with-ssl[=DIR]   SSL crypt support (needs OpenSSL)],dnl
+ [if test "$withval" != "no"; then
+   AC_DEFINE(OPENSSL,,[Crypto (SSL) support])
+   OPENSSL=1
+   if test "$withval" != "yes"; then
+	SSLROOT=$withval
+	LDFLAGS="${LDFLAGS} -L$SSLROOT/lib"
+        CPPFLAGS="${CPPFLAGS} -I$SSLROOT/include"  
+   fi
+ fi],
+ dnl Default: disable it
+)
+AC_ARG_WITH(gnutls,
+ [  --with-gnutls[=DIR]   SSL/TLS crypt support (needs GNU TLS), the argument DIR should not be necessary],dnl
+ [if test "$withval" != "no"; then
+  if test "$withval" = "yes"; then
+      PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0],
+      [
+      echo "GnuTLS found"
+      AC_DEFINE(GNUTLS,,[Crypto (TLS) support])
+      GNUTLS=1
+      CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+      LIBS="$LIBS $LIBGNUTLS_LIBS"
+      ],)
+      else
+      AC_DEFINE(GNUTLS,,[Crypto (TLS) support])
+      GNUTLS=1
+      GNUTLSROOT=$withval
+      LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib -lgnutls"
+      CPPFLAGS="${CPPFLAGS} -I$GNUTLSROOT/include"
+   fi
+ fi],
+ dnl Default: disable it 
+) 
+dnl TODO: test if the getopt variable optreset exists and, if it
+dnl does, we can use getopt (Free BSDs and MacOS X). This implies to
+dnl maintain the two versions, popt and getopt, while echoping has 
+dnl many options. It probably means a high-level language to describe
+dnl the options and to produce the two versions. gengetopt is an obvious
+dnl candidate.
+AC_ARG_WITH(popt,
+ [  --with-popt[=DIR]  popt command-line parsing library],dnl
+ [if test "$withval" != "no"; then
+   if test "$withval" != "yes"; then
+	POPTROOT=$withval
+	LDFLAGS="${LDFLAGS} -L$POPTROOT/lib"
+        CPPFLAGS="${CPPFLAGS} -I$POPTROOT/include"  
+   fi
+  else
+	AC_MSG_ERROR([The popt command-line parsing library is mandatory for echoping])
+ fi],
+ dnl Default: disable it
+)
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_INSTALL
+
+dnl Checks for libraries.
+
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS(sys/time.h unistd.h)
+
+case $host_os in
+osf*)
+	# Stupid bug appeared in Tru64-OSF1 v5. socklen_t is undefined without
+	# the following workaround. 
+        CPPFLAGS="$CPPFLAGS -D_POSIX_PII_SOCKET"
+        ;;
+*darwin*)
+ 	# See bug #748145 and #765777
+        CPPFLAGS="$CPPFLAGS -D_BSD_SOCKLEN_T_=int -no-cpp-precomp"
+	;;
+esac
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_HEADER_TIME
+
+dnl Checks for library functions.
+CF_LIB_SOCKET
+CF_LIB_NSL
+CF_LIB_MATH
+AC_TYPE_SIGNAL
+AC_FUNC_VPRINTF
+dnl Some Unices like Tru64 or Mac OS X has getaddrinfo() or
+dnl getnameinfo() but has it renamed in libc as something else so we
+dnl must include <netdb.h> to get the redefinition. (Stolen from rsync)
+dnl autoconf AC_CHECK_FUNCS does not allow headers to be easily included :-(
+AC_CHECK_FUNCS(getaddrinfo getnameinfo inet_ntop, ,
+	[AC_MSG_CHECKING([$ac_func again by including <netdb.h>])
+	AC_TRY_LINK([#include <sys/types.h>
+	#include <sys/socket.h>
+	#include <netdb.h>],[$ac_func(NULL, NULL, NULL, NULL);],
+		[AC_MSG_RESULT([yes])],
+		[AC_MSG_ERROR([Missing mandatory function - echoping now uses the new network functions (RFC 2133) which are mandatory for IPv6])]
+         	)])
+		
+AC_CHECK_FUNCS(gettimeofday socket sigaction strerror, , AC_MSG_ERROR(Missing mandatory function))
+AC_CHECK_FUNCS(poptGetContext, , 
+   [AC_CHECK_LIB(popt,poptGetContext, ,
+      [AC_MSG_ERROR([Missing popt library, get it from ftp://ftp.rpm.org/pub/rpm/dist/rpm-x.y.z])])])
+AC_CHECK_FUNCS(usleep) dnl TODO: use the Autoconf macro http://www.gnu.org/software/ac-archive/htmldoc/etr_short_sleep.html
+AC_CHECK_FUNCS(dlopen, , 
+   [AC_CHECK_LIB(dl,dlopen, ,
+       [AC_MSG_ERROR([echoping requires dlopen (dynamic loading of libraries) for plugins])])])
+
+if test "$LIBIDN" = "1"; then
+CF_LIB_LIBIDN
+fi
+if test "$OPENSSL" = "1" && test "$GNUTLS" = "1"; then
+AC_MSG_ERROR([Choose OpenSSL or GNU TLS but not both])
+fi
+if test "$OPENSSL" = "1"; then
+CF_LIB_OPENSSL
+fi
+if test "$GNUTLS" = "1"; then
+CF_LIB_GNUTLS
+fi
+
+AC_MSG_CHECKING([TCP info from socket])
+AC_TRY_COMPILE(
+ [#include <sys/types.h>
+  #include <sys/socket.h>
+  /* TODO: including tcp.h may not be necessary */
+  #include <netinet/tcp.h>
+ ],
+ [int foobar = SOL_TCP;],
+ [AC_DEFINE(HAVE_TCP_INFO,,[TCP info from socket])
+  ac_have_tcp_info="yes"],
+ ac_have_tcp_info=no)
+AC_MSG_RESULT($ac_have_tcp_info)
+AC_ARG_ENABLE(tcp_info,
+ [  --enable-tcp-info   TCP info from socket],
+ [if test "$enableval" = "yes"; then
+   if test $ac_have_tcp_info = "yes"; then
+     AC_DEFINE(HAVE_TCP_INFO,,[TCP info from socket])
+     TCP_INFO=1
+   else
+     AC_MSG_WARN([No TCP info support on this system, request ignored])
+   fi
+  fi],
+ dnl Default: enable it if supported
+ if test $ac_have_tcp_info = "yes"; then
+   AC_DEFINE(HAVE_TCP_INFO,,[TCP info])
+   TCP_INFO=1
+ fi)
+
+dnl Type Of Service
+AC_MSG_CHECKING([Type Of Service])
+AC_TRY_COMPILE(
+ [#include <sys/types.h>
+  #include <netinet/in.h>
+ ],
+ [int foobar = IP_TOS;],
+ [AC_DEFINE(HAVE_TOS,,[Type Of Service support])
+  ac_have_tos="yes"],
+ ac_have_tos="no")
+AC_MSG_RESULT($ac_have_tos)
+AC_ARG_ENABLE(tos,
+ [  --enable-tos   TOS (Type Of Service) support],
+ [if test "$enableval" = "yes"; then
+   if test $ac_have_tos = "yes"; then
+     AC_DEFINE(HAVE_TOS,,[Type Of Service support])
+     TOS=1
+   else
+     AC_MSG_WARN([No TOS support on this system, request ignored])
+   fi
+  fi],
+ dnl Default: enable it if supported
+ if test $ac_have_tos = "yes"; then
+   AC_DEFINE(HAVE_TOS,,[Type Of Service support])
+   TOS=1
+ fi)
+
+dnl Socket priority
+dnl Linux only, it seems. Anyone knows a standard way to do so?
+AC_MSG_CHECKING([Socket priority])
+AC_TRY_COMPILE(
+ [#include <sys/types.h>
+  #include <sys/socket.h>
+ ],
+ [int foobar = SO_PRIORITY;],
+ [AC_DEFINE(HAVE_SOCKET_PRIORITY)
+  ac_have_priority="yes"],
+ ac_have_priority="no")
+AC_MSG_RESULT($ac_have_priority)
+AC_ARG_ENABLE(priority,
+ [  --enable-priority   PRIORITY (socket priority) support],
+ [if test "$enableval" = "yes"; then
+   if test $ac_have_priority = "yes"; then
+     AC_DEFINE(HAVE_SOCKET_PRIORITY,,[Socket priority support])
+     PRIORITY=1
+   else
+     AC_MSG_WARN([No socket priority support on this system, request ignored])
+   fi
+  fi],
+ dnl Default: enable it if supported
+ if test $ac_have_priority = "yes"; then
+   AC_DEFINE(HAVE_SOCKET_PRIORITY,,[Socket priority support])
+   PRIORITY=1
+ fi)
+
+dnl SCTP, RFC 4960, feature request #1676608
+AC_MSG_CHECKING([SCTP])
+AC_TRY_COMPILE(
+ [#include <sys/types.h>
+  #include <netinet/in.h>
+ ],
+ [int foobar = IPPROTO_SCTP;],
+ [AC_DEFINE(HAVE_SCTP,,[SCTP support])
+  ac_have_sctp="yes"],
+ ac_have_sctp="no")
+AC_MSG_RESULT($ac_have_sctp)
+AC_ARG_ENABLE(sctp,
+ [  --enable-sctp   SCTP (Stream Control Transmission Protocol) support],
+ [if test "$enableval" = "yes"; then
+   if test $ac_have_sctp = "yes"; then
+     AC_DEFINE(HAVE_SCTP,,[Stream Control Transmission Protocol support])
+     SCTP=1
+   else
+     AC_MSG_WARN([No SCTP support on this system, request ignored])
+   fi
+  fi],
+ dnl Default: enable it if supported
+ if test $ac_have_sctp = "yes"; then
+   AC_DEFINE(HAVE_SCTP,,[Stream Control Transmission Protocol support])
+   SCTP=1
+ fi)
+
+if test "$GCC" = yes; then
+        CFLAGS="$CFLAGS -Wall"
+fi
+
+interpolate() {  
+  old=$1
+  eval new=$old
+  if test "$new" != "$old" ; then
+	interpolate $new
+  else 
+     echo $new
+  fi
+}
+dnl TODO: the following is broken because installation prefix can be changed at instal-time,
+dnl not compilation time.
+if test "x$libdir" = 'x${exec_prefix}/lib' ; then # Default value
+	if test "x$exec_prefix" = "xNONE" ; then # Default value
+		if test "x$prefix" = "xNONE" ; then # Default value
+  			plugins_dir=`interpolate '$ac_default_prefix/lib/echoping'`
+		else
+  			exec_prefix='${prefix}'	
+  			plugins_dir=`interpolate '$libdir/echoping'`
+		fi
+	else
+  		plugins_dir=`interpolate '$libdir/echoping'`
+	fi
+else
+	plugins_dir=`interpolate '$libdir/echoping'`
+fi
+AC_DEFINE_UNQUOTED(PLUGINS_DIR, "$plugins_dir", [Directory where the plugins will be installed])
+AC_SUBST(plugins_dir)
+# TODO: make distcheck complains here that "plugins" does not exist???
+echo $plugins_dir > plugins/dir
+AC_CONFIG_SUBDIRS(plugins)
+
+compil_options=""
+AC_DEFUN([DISPLAY_SETTING],
+[
+echo $ECHO_N $1 ": "
+compil_options="$compil_options\n$1:"
+if [ eval 'test "$$1" = "1"' > /dev/null]; then
+	AC_MSG_RESULT( enabled)
+	compil_options="$compil_options enabled"	
+else 
+	AC_MSG_RESULT( disabled)
+	compil_options="$compil_options disabled "
+fi
+])dnl
+echo ""
+echo "Configuration of echoping:"
+
+DISPLAY_SETTING(HTTP)
+DISPLAY_SETTING(ICP)
+DISPLAY_SETTING(OPENSSL)
+DISPLAY_SETTING(GNUTLS)
+DISPLAY_SETTING(SMTP)
+DISPLAY_SETTING(LIBIDN)
+DISPLAY_SETTING(TOS)
+DISPLAY_SETTING(SCTP)
+DISPLAY_SETTING(PRIORITY)
+
+compil_date=`date +%Y-%m-%d`
+hostname=$ac_hostname
+AC_SUBST(hostname)
+AC_SUBST(compil_options)
+AC_SUBST(compil_date)
+AC_OUTPUT(Makefile echoping.1 compilation.h)
+
+
+
+
+
+

SRC/configure.in

@@ -1,210 +0,0 @@
-dnl $Id$
-
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(echoping.h)
-AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE(echoping, 5.0.0)
-AM_CONFIG_HEADER(config.h)
-
-dnl User options
-AC_ARG_ENABLE(http,
- [--enable-http   HTTP (Web's main protocol) support],dnl
- [if test "$enableval" = "yes"; then
- AC_DEFINE(HTTP)
- HTTP=1
- fi],
- dnl Default: enable it
- [AC_DEFINE(HTTP)
-  HTTP=1])
-AC_ARG_ENABLE(icp,
- [--enable-icp   ICP (for testing Web proxies/caches) support],dnl
- [if test "$enableval" = "yes"; then
- AC_DEFINE(ICP)
- ICP=1
- fi])
-AC_ARG_ENABLE(smtp,
- [--enable-smtp   SMTP (Mail's main protocol) support],dnl
- [if test "$enableval" = "yes"; then
- AC_DEFINE(SMTP)
- SMTP=1
- fi],
- dnl Default: enable it
- [AC_DEFINE(SMTP)
-  SMTP=1])
-AC_ARG_WITH(ssl,
- [--with-ssl[=DIR]   SSL crypt support (needs OpenSSL)],dnl
- [if test "$withval" != "no"; then
-   AC_DEFINE(OPENSSL)
-   OPENSSL=1
-   if test "$withval" != "yes"; then
-	SSLROOT=$withval
-	LDFLAGS="${LDFLAGS} -L$SSLROOT/lib"
-        CPPFLAGS="${CPPFLAGS} -I$SSLROOT/include"  
-   fi
- fi],
- dnl Default: disable it
-)
-
-dnl See T/TCP later 
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_INSTALL
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(sys/time.h unistd.h)
-CF_SYS_ERRLIST
-
-case $host_os in
-osf*)
-	# Stupid bug appeared in Tru64-OSF1 v5. socklen_t is undefined without
-	# the following workaround. 
-        CPPFLAGS="$CPPFLAGS -D_POSIX_PII_SOCKET"
-        ;;
-esac
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_HEADER_TIME
-
-dnl Checks for library functions.
-CF_LIB_SOCKET
-CF_LIB_NSL
-CF_LIB_MATH
-AC_TYPE_SIGNAL
-AC_FUNC_VPRINTF
-dnl Some Unices like Tru64 or Mac OS X has getaddrinfo() or
-dnl getnameinfo() but has it renamed in libc as something else so we
-dnl must include <netdb.h> to get the redefinition. (Stolen from rsync)
-dnl autoconf AC_CHECK_FUNCS does not allow headers to be easily included :-(
-AC_CHECK_FUNCS(getaddrinfo getnameinfo inet_ntop, ,
-	[AC_MSG_CHECKING([$ac_func again by including <netdb.h>])
-	AC_TRY_LINK([#include <sys/types.h>
-	#include <sys/socket.h>
-	#include <netdb.h>],[$ac_func(NULL, NULL, NULL, NULL);],
-		[AC_MSG_RESULT([yes])],
-		[AC_MSG_ERROR([Missing mandatory function - echoping now uses the new network functions (RFC 2133) which are mandatory for IPv6])]
-         	)])
-		
-AC_CHECK_FUNCS(gettimeofday socket sigaction, , AC_MSG_ERROR(Missing mandatory function))
-AC_CHECK_FUNCS(usleep)
-
-if test "$OPENSSL" = "1"; then
-CF_LIB_OPENSSL
-fi
-
-dnl T/TCP
-AC_MSG_CHECKING([T/TCP])
-AC_TRY_COMPILE(
- [#include <sys/types.h>
-  #include <sys/socket.h>
- ],
- [int foobar = MSG_EOF;],
- [AC_DEFINE(TTCP)
-  ac_have_ttcp="yes"],
- ac_have_ttcp=no)
-AC_MSG_RESULT($ac_have_ttcp)
-AC_ARG_ENABLE(ttcp,
- [--enable-ttcp   T/TCP (Transaction TCP) support],
- [if test "$enableval" = "yes"; then
-   if test $ac_have_ttcp = "yes"; then
-     AC_DEFINE(HAVE_TTCP)
-     TTCP=1
-   else
-     AC_MSG_WARN([No T/TCP support on this system, request ignored])
-   fi
-  fi],
- dnl Default: enable it if supported
- if test $ac_have_ttcp = "yes"; then
-   AC_DEFINE(HAVE_TTCP)
-   TTCP=1
- fi)
-
-dnl Type Of Service
-AC_MSG_CHECKING([Type Of Service])
-AC_TRY_COMPILE(
- [#include <sys/types.h>
-  #include <netinet/in.h>
- ],
- [int foobar = IP_TOS;],
- [AC_DEFINE(HAVE_TOS)
-  ac_have_tos="yes"],
- ac_have_tos="no")
-AC_MSG_RESULT($ac_have_tos)
-AC_ARG_ENABLE(tos,
- [--enable-tos   TOS (Type Of Service) support],
- [if test "$enableval" = "yes"; then
-   if test $ac_have_tos = "yes"; then
-     AC_DEFINE(HAVE_TOS)
-     TOS=1
-   else
-     AC_MSG_WARN([No TOS support on this system, request ignored])
-   fi
-  fi],
- dnl Default: enable it if supported
- if test $ac_have_tos = "yes"; then
-   AC_DEFINE(HAVE_TOS)
-   TOS=1
- fi)
-
-dnl Socket priority
-dnl Linux only, it seems. Anyone knows a standard way to do so?
-AC_MSG_CHECKING([Socket priority])
-AC_TRY_COMPILE(
- [#include <sys/types.h>
-  #include <sys/socket.h>
- ],
- [int foobar = SO_PRIORITY;],
- [AC_DEFINE(HAVE_SOCKET_PRIORITY)
-  ac_have_priority="yes"],
- ac_have_priority="no")
-AC_MSG_RESULT($ac_have_priority)
-AC_ARG_ENABLE(priority,
- [--enable-priority   PRIORITY (socket priority) support],
- [if test "$enableval" = "yes"; then
-   if test $ac_have_priority = "yes"; then
-     AC_DEFINE(HAVE_SOCKET_PRIORITY)
-     PRIORITY=1
-   else
-     AC_MSG_WARN([No socket priority support on this system, request ignored])
-   fi
-  fi],
- dnl Default: enable it if supported
- if test $ac_have_priority = "yes"; then
-   AC_DEFINE(HAVE_SOCKET_PRIORITY)
-   PRIORITY=1
- fi)
-
-if test "$GCC" = yes; then
-        CFLAGS="$CFLAGS -Wall"
-fi
-
-AC_OUTPUT(Makefile)
-
-AC_DEFUN([DISPLAY_SETTING],
-[
-AC_MSG_CHECKING($1)
-if [ eval 'test "$$1" = "1"' > /dev/null]; then
-	AC_MSG_RESULT( enabled)
-else 
-	AC_MSG_RESULT( disabled)
-fi
-])dnl
-echo ""
-echo "Configuration of echoping:"
-
-DISPLAY_SETTING(HTTP)
-DISPLAY_SETTING(ICP)
-DISPLAY_SETTING(OPENSSL)
-DISPLAY_SETTING(SMTP)
-DISPLAY_SETTING(TTCP)
-DISPLAY_SETTING(TOS)
-DISPLAY_SETTING(PRIORITY)
-
-
-
-
-

SRC/contrib/README

@@ -0,0 +1,3 @@
+Various echoping goodies, plugins, etc. No warranty at all, no
+support.
+

SRC/contrib/adamsnames/Makefile.am

@@ -0,0 +1,9 @@
+if ADAMSNAMESBUILD
+bin_PROGRAMS = test-domquery
+test_domquery_SOURCES = test-domquery.c 
+pkglib_LTLIBRARIES = domquery.la
+domquery_la_SOURCES = domquery.c util.c
+domquery_la_LDFLAGS = -module
+endif
+
+

SRC/contrib/adamsnames/common.h

@@ -0,0 +1,10 @@
+#define CLIENT_NAME "XML-RPC Adams Names plugin for echoping"
+#define CLIENT_VERSION "0.0"
+
+#define ENDPOINT "http://www.adamsnames.tc/api/xmlrpc" 
+
+poptContext poptcon;
+xmlrpc_env env;
+char *domain;
+
+/* $Id$ */

SRC/contrib/adamsnames/configure.ac

@@ -0,0 +1,17 @@
+dnl $Id$
+
+AC_INIT(adamsnames, 0.0-BETA)
+AC_PROG_CC(cc gcc)
+AC_PROG_LIBTOOL
+AM_INIT_AUTOMAKE(foreign)
+AC_CONFIG_HEADERS(config.h)
+
+AC_CHECK_PROG(ADAMSNAMES_BUILD, xmlrpc-c-config, 1, 0)
+if test "$ADAMSNAMES_BUILD" = 1; then
+   LIBS="${LIBS} `xmlrpc-c-config libwww-client --libs`"
+   CCFLAGS="${CCFLAGS} `xmlrpc-c-config libwww-client --cflags`"
+else
+   AC_ERROR([No XML-RPC C developement environment found, get it from http://xmlrpc-c.sourceforge.net/])
+fi
+AM_CONDITIONAL(ADAMSNAMESBUILD, test "$ADAMSNAMES_BUILD" = 1)
+AC_OUTPUT(Makefile)

SRC/contrib/adamsnames/domquery.c

@@ -0,0 +1,111 @@
+/* echoping plugin to query (with XML-RPC) Adam's Names, the DNS registry.
+  See http://www.adamsnames.tc/api/xmlrpc.html.
+  $Id$ 
+*/
+
+#define IN_PLUGIN
+#include "../../echoping.h"
+
+#include <stdio.h>
+
+/* http://xmlrpc-c.sourceforge.net/ */
+#include <xmlrpc.h>
+#include <xmlrpc_client.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "common.h"
+
+void
+domquery_usage(char *msg)
+{
+    fprintf(stderr, "%s\n", msg);
+    poptPrintUsage(poptcon, stderr, 0);
+    err_quit("   domain");
+}
+
+char           *
+init(int argc, char **argv)
+{
+    int             value;
+    xmlrpc_value   *result;
+    xmlrpc_bool     free, read_contacts;
+    xmlrpc_int32    reason;
+    char           *msg, *hostname;
+
+    struct poptOption options[] = {
+        {"read-contacts", 'c', POPT_ARG_NONE, &read_contacts, 0,
+         "Read also the contacts of the domain [NOT IMPLEMENTED]",
+         ""},
+        POPT_AUTOHELP POPT_TABLEEND
+    };
+    poptcon = poptGetContext(NULL, argc, argv, options, POPT_CONTEXT_KEEP_FIRST);
+    while ((value = poptGetNextOpt(poptcon)) > 0) {
+        if (value < -1) {
+            sprintf(msg, "%s: %s",
+                    poptBadOption(poptcon, POPT_BADOPTION_NOALIAS),
+                    poptStrerror(value));
+            domquery_usage(msg);
+        }
+    }
+    hostname = (char *) poptGetArg(poptcon);    /* Not used */
+    domain = (char *) poptGetArg(poptcon);
+    if (domain == NULL || !strcmp(domain, ""))
+        domquery_usage("Mandatory request missing");
+
+    return NULL;
+}
+
+void
+start_raw()
+{
+
+    /* Start up our XML-RPC client library. */
+    xmlrpc_client_init(XMLRPC_CLIENT_NO_FLAGS, CLIENT_NAME, CLIENT_VERSION);
+
+    /* Initialize our error-handling environment. */
+    xmlrpc_env_init(&env);
+
+    printf("env initialized\n");
+
+}
+
+int
+execute()
+{
+    xmlrpc_value   *result;
+    xmlrpc_value   *domain_h;
+    xmlrpc_int32    found;
+    xmlrpc_value   *error;
+    /* char *dst; dst = HTAnchor_findAddress(ENDPOINT); */
+    printf("Ready to call\n");
+    /* Call the server */
+    result = xmlrpc_client_call(&env, ENDPOINT, "domquery", "(s)", domain);
+    die_if_fault_occurred(&env);
+    printf("Call done, now parsing\n");
+
+    xmlrpc_parse_value(&env, result, "{s:i,*}", "found", &found);
+    die_if_fault_occurred(&env);
+    if (found) {
+        printf("%s is there\n", domain);
+        xmlrpc_parse_value(&env, result, "{s:S,i,s:A,*}", "domain",
+                           &domain_h, "found", &found, "error", &error);
+        die_if_fault_occurred(&env);
+    }
+    /* Dispose of our result value. */
+    xmlrpc_DECREF(result);
+    return 0;
+}
+
+void
+terminate()
+{
+    /* Clean up our error-handling environment. */
+    xmlrpc_env_clean(&env);
+
+    /* Shutdown our XML-RPC client library. */
+    xmlrpc_client_cleanup();
+
+}

SRC/contrib/adamsnames/test-domquery.c

@@ -0,0 +1,80 @@
+#include <stdio.h>
+
+/* http://xmlrpc-c.sourceforge.net/ */
+#include <xmlrpc.h>
+#include <xmlrpc_client.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define CLIENT_NAME "XML-RPC Adams Names plugin for echoping"
+#define CLIENT_VERSION "0.0"
+
+#define ENDPOINT "http://www.adamsnames.tc/api/xmlrpc"
+
+void
+die_if_fault_occurred(xmlrpc_env * env)
+{
+    if (env->fault_occurred) {
+        fprintf(stderr, "XML-RPC Fault: %s (%d)\n",
+                env->fault_string, env->fault_code);
+        exit(1);
+    }
+}
+
+int
+main(int argc, char **argv)
+{
+    int             value;
+    xmlrpc_value   *result;
+    xmlrpc_bool     free, read_contacts;
+    xmlrpc_int32    reason;
+    xmlrpc_value   *domain_h;
+    xmlrpc_int32    found;
+    xmlrpc_value   *error;
+    xmlrpc_env      env;
+    char           *domain;
+    char           *date, *holder;
+
+    if (argc != 2) {
+        fprintf(stderr, "Usage: %s domain\n", argv[0]);
+        exit(1);
+    }
+
+    domain = argv[1];
+
+    /* Start up our XML-RPC client library. */
+    xmlrpc_client_init(XMLRPC_CLIENT_NO_FLAGS, CLIENT_NAME, CLIENT_VERSION);
+
+    /* Initialize our error-handling environment. */
+    xmlrpc_env_init(&env);
+
+    /* Call the server */
+    result = xmlrpc_client_call(&env, ENDPOINT, "domquery", "(s)", domain);
+    die_if_fault_occurred(&env);
+
+    xmlrpc_parse_value(&env, result, "{s:i,*}", "found", &found);
+    die_if_fault_occurred(&env);
+    if (found) {
+        printf("%s is there\n", domain);
+        xmlrpc_parse_value(&env, result, "{s:S,s:i,s:A,*}", "domain",
+                           &domain_h, "found", &found, "error", &error);
+        die_if_fault_occurred(&env);
+        /* printf ("Type of domain: %d\n", xmlrpc_value_type(domain_h)); */
+        xmlrpc_parse_value(&env, domain_h, "{s:s,s:s,*}", "registered",
+                           &date, "org", &holder);
+        die_if_fault_occurred(&env);
+        printf("Registered on %s by %s\n", date, holder);
+    } else {
+        printf("Unknown domain %s\n", domain);
+    }
+    /* Dispose of our result value. */
+    xmlrpc_DECREF(result);
+    /* Clean up our error-handling environment. */
+    xmlrpc_env_clean(&env);
+
+    /* Shutdown our XML-RPC client library. */
+    xmlrpc_client_cleanup();
+
+}

SRC/contrib/adamsnames/util.c

@@ -0,0 +1,12 @@
+/* $Id$ */
+
+#include <xmlrpc.h>
+#include <xmlrpc_client.h>
+
+void
+die_if_fault_occurred(xmlrpc_env * env)
+{
+    if (env->fault_occurred) {
+        err_quit("XML-RPC Fault: %s (%d)\n", env->fault_string, env->fault_code);
+    }
+}

SRC/contrib/daytime/Makefile

@@ -0,0 +1,17 @@
+XCFLAGS=-Wall -O0 -g -fPIC ${CFLAGS}
+LDFLAGS=-shared
+
+OBJECTS=daytime.o
+
+all: daytime.so
+
+%.o: %.c
+	${CC} ${XCFLAGS} -c -o $@ $<
+
+%.so: %.o
+	${CC} ${LDFLAGS} -o $@ $<
+
+clean: 
+	-rm -f *.o *.so 
+
+.SECONDARY: ${OBJECTS}

SRC/contrib/daytime/daytime.c

@@ -0,0 +1,54 @@
+/*
+ * Daytime (RFC 867) plugin. 
+ *
+ * $Id$
+ */
+
+#define IN_PLUGIN
+#include <echoping/echoping.h>
+
+struct addrinfo daytime_server;
+int             sockfd;
+echoping_options options;
+
+char           *
+init(const int argc, const char **argv, echoping_options global_options)
+{
+    if (global_options.udp)
+        err_quit("Sorry, UDP is not yet compatible with this daytime plugin");
+    options = global_options;
+    return "daytime";
+}
+
+void
+start(struct addrinfo *res)
+{
+    daytime_server = *res;
+}
+
+int
+execute()
+{
+    int             nr;
+    FILE           *file;
+#define MAX 256
+    char            recvline[MAX];
+    if ((sockfd =
+         socket(daytime_server.ai_family, daytime_server.ai_socktype,
+                daytime_server.ai_protocol)) < 0)
+        err_sys("Can't open socket");
+    if (connect(sockfd, daytime_server.ai_addr, daytime_server.ai_addrlen) < 0)
+        err_sys("Can't connect to server");
+    if ((file = fdopen(sockfd, "r")) == NULL)
+        err_sys("Cannot fdopen");
+    nr = readline(file, recvline, MAX, 1);
+    if (options.verbose)
+        printf("%s", recvline);
+    close(sockfd);
+    return 1;
+}
+
+void
+terminate()
+{
+}

SRC/contrib/lose-packets

@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# Dangerous. Use only if you know what you do.
+
+# Linux-only
+
+# Configure the Linux traffic control to lose packets, in order to test
+# echoping.
+
+# http://linux-net.osdl.org/index.php/Netem
+
+DEVICE="tap0"
+PROTOCOL="udp"
+DEST_PORTS="7 53"
+# In percent
+LOSS=20
+# In milli-seconds
+DELAY=40
+CLEAN_FIRST="YES"
+USE_IPTABLES="YES"
+
+# Do not touch afterwards
+INTERESTING="4"
+PLAIN="0"
+
+if [ ! -z "$CLEAN_FIRST" ]; then
+   tc qdisc del dev ${DEVICE} root
+   iptables -t mangle -F INPUT
+   iptables -t mangle -F OUTPUT
+fi
+
+tc qdisc add dev ${DEVICE} root handle 1: prio
+
+tc qdisc add dev ${DEVICE} parent 1:2 handle ${INTERESTING}: \
+    netem delay ${DELAY}ms loss ${LOSS}% 
+
+#tc qdisc add dev ${DEVICE} parent ${INTERESTING}:1 \
+#    tbf rate 20kbit buffer 1600 limit 3000
+
+if [ -z "$USE_IPTABLES" ] || [ "$USE_IPTABLES" = "NO" ]; then
+    for port in ${DEST_PORTS}; do
+	# Note: $PROTOCOL is ignored...
+	tc filter add dev ${DEVICE} protocol ip parent 1:0 prio 2 u32 \
+	    match ip dport ${port} 0xffff flowid 10:5
+    done
+else
+    tc filter add dev ${DEVICE} protocol ip parent 1:0 prio 2 \
+	handle ${INTERESTING} fw flowid 10:5
+    # Not perfect: it seems all ports are affected :-(
+    for port in ${DEST_PORTS}; do
+	# Ingress
+	iptables -t mangle -A INPUT -i ${DEVICE} -p ${PROTOCOL} --sport ${port} \
+	    -j MARK --set-mark ${INTERESTING}
+        # Egress
+	iptables -t mangle -A OUTPUT -o ${DEVICE} -p ${PROTOCOL} --dport ${port} \
+	    -j MARK --set-mark ${INTERESTING}
+    done
+fi

SRC/contrib/small-services/Makefile.am

@@ -0,0 +1,5 @@
+pkglib_LTLIBRARIES = smallservices.la
+smallservices_la_SOURCES = small-services.c
+smallservices_la_LDFLAGS = -module
+
+

SRC/contrib/small-services/README

@@ -0,0 +1,10 @@
+small-services is an echoping plugin which implements the following
+network services: 
+
+* echo (RFC 862)
+* discard (RFC 863)
+* chargen (RFC 864)
+
+As of today (2007-12-21), these services are in the main echoping tree
+but the idea is to move them to this plugin in the future. See
+echoping Feature Request #1694557 at Sourceforge.

SRC/contrib/small-services/configure.ac

@@ -0,0 +1,9 @@
+dnl $Id: configure.ac 377 2007-03-12 20:48:05Z bortz $
+
+AC_INIT(small-services, 0.0-BETA)
+AC_PROG_CC(cc gcc)
+AC_PROG_LIBTOOL
+AM_INIT_AUTOMAKE(foreign)
+AC_CONFIG_HEADERS(config.h)
+
+AC_OUTPUT(Makefile)

SRC/contrib/small-services/small-services.c

@@ -0,0 +1,58 @@
+/*
+ *
+ * $Id: daytime.c 395 2007-04-04 19:26:19Z bortz $
+ */
+
+#define IN_PLUGIN
+#include <echoping/echoping.h>
+
+struct addrinfo smallservices_server;
+int             sockfd;
+echoping_options options;
+
+char           *
+init(const int argc, const char **argv, echoping_options global_options)
+{
+    options = global_options;
+    /* TODO: the service returned must depend on the options */
+    return "echo";
+}
+
+void
+start(struct addrinfo *res)
+{
+    smallservices_server = *res;
+}
+
+int
+execute()
+{
+    int             nr;
+#define MAX 256
+#define TEST_STRING "test"
+    char            result[MAX];
+    if ((sockfd =
+         socket(smallservices_server.ai_family, smallservices_server.ai_socktype,
+                smallservices_server.ai_protocol)) < 0)
+        err_sys("Can't open socket");
+    if (connect
+        (sockfd, smallservices_server.ai_addr, smallservices_server.ai_addrlen) < 0)
+        err_sys("Can't connect to server");
+    if (write(sockfd, TEST_STRING, strlen(TEST_STRING)) != strlen(TEST_STRING))
+        err_sys("Cannot write");
+    nr = read(sockfd, result, strlen(TEST_STRING));
+    if (nr != strlen(TEST_STRING))
+        err_sys("Cannot read (only %i bytes)", nr);     /* TODO: the server may send 
+                                                         * the result in chunks, we 
+                                                         * should loop */
+    if (strcmp(result, TEST_STRING) != 0)
+        err_sys("Result \"%s\" is different from test string \"%s\"",
+                result, TEST_STRING);
+    close(sockfd);
+    return 1;
+}
+
+void
+terminate()
+{
+}

SRC/echoping.1.in

@@ -8,16 +8,18 @@ echoping \- tests a remote host with TCP or UDP
 .RI [-4] 
 .RI [-6] 
 .RI [-v] 
-.RI [-r] 
+.RI [-V] 
 .RI [-f fill] 
 .RI [-t timeout] 
 .RI [-c] 
 .RI [-d] 
 .RI [-u] 
+.RI [-T]
 .RI [-s size] 
 .RI [-n number] 
 .RI [-w delay] 
-.RI [-h url] 
+.RI [-h url-or-path]
+.RI [-R] 
 .RI [-i url] 
 .RI [-p priority] 
 .RI [-P tos] 
@@ -25,8 +27,10 @@ echoping \- tests a remote host with TCP or UDP
 .RI [-S] 
 .RI [-A] 
 .RI [-a] 
+.RI [-m plugin] 
 .B hostname
 [:port]
+[plugin options...]
 
 .SH DESCRIPTION 
 .LP
@@ -45,12 +49,15 @@ to use it (carefully) to measure Web performances.
 .SH ARGUMENT
 .IP hostname[:port]
 Name (or address) of the server to test. For HTTP, you can specify a
-port number. For HTTP and IPv6, you can use RFC 2732 syntax (you will
-probably need to escape the brackets from the shell).
+port number. For HTTP and IPv6, you can use RFC 3986 syntax (you will
+probably need to escape the brackets from the shell). The name can be
+an IDN (Unicode domain name).
 
 .SH OPTIONS
 .IP -v
 Verbose
+.IP -V
+Displays the compiled-in configuration of echoping. Useful for bug reports.
 .IP -s\ nnn
 Size of the data to send. Large values can produce strange results with
 some echo servers.
@@ -74,14 +81,21 @@ Number of seconds to wait a reply before giving up. For TCP, this is the
 maximum number of seconds for the whole connection (setup and data exchange).
 .IP -u
 Use UDP instead of TCP
+.IP -T
+Use SCTP instead of TCP
 .IP -d
 Use the "discard" service instead of echo
 .IP -c
 Use the "chargen" service instead of echo
-.IP -h\ url
-Use the HTTP protocol (instead of echo) for the given URL. The URL has to
-be a relative one (for instance '/' or '/pics/foobar.gif') because HTTP 1.0
-servers will not understand a request for an absolute URL.
+.IP -h\ url-or-path
+Use the HTTP protocol (instead of echo) for the given URL. If the
+hostname is the Web server, the argument has to
+be a path, a relative URL (for instance '/' or '/pics/foobar.gif'). If the
+hostname is a proxy/cache like Squid, the argument has to
+be an absolute URL.
+.IP -R 
+Accept HTTP status codes 3xx (redirections) as normal responses (the
+default is to regard them as errors)
 .IP -i\ url
 Use the ICP protocol (instead of echo) for the given URL. The URL has to
 be an absolute one. This is mostly for testing Squid Web proxy/caches.
@@ -93,14 +107,17 @@ Force the proxy (if you use one) to revalidate data with the original server
 Use the SSL/TLS (cryptography) protocol. For HTTP tests only.
 .IP -S
 Use the SMTP protocol (instead of echo) for the given server.
-.IP -r
-Use T/TCP (if it has been compiled with it). See the INSTALL file for details.
 .IP -4
 Use only IPv4 (even if the target machine has an IPv6 address)
 .IP -6
 Use only IPv6 (even if the target machine has an IPv4 address)
 .IP -f\ character
 Fill the packet with this character (default is random filling)
+.IP -D 
+Tries to display actual data transfer duration only, not total time
+.IP -N\ n
+Displays an average which excludes values ("outliers") which are
+further than +/- N*standard deviation 
 .IP -p\ n
 Send packets with the socket priority to the integer
 .IR n .
@@ -120,6 +137,18 @@ or
 .BR ip(4) 
 (depending on your Unix). /usr/include/netinet/ip.h may contain
 interesting constants for setting Type Of Service.
+.IP -m\ plugin
+Load the given plugin. The plugin is first
+searched in the normal library directories (see 
+.BR ld.so(8)
+) then in @plugins_dir@. You can type 
+.BR ls
+in @plugins_dir@ to get an idea of the available plugins. The documentation for a
+given plugin is in 
+.BR echoping_PLUGINNAME(1)
+The plugin-specific options appear
+.B after
+the hostname.
 .SH EXAMPLES
 .IP echoping\ \-v\ foobar.example.com
 Tests the remote machine with TCP echo (one test).
@@ -131,6 +160,9 @@ indicate the whole URL.
 .IP echoping\ \-h\ http://www.example.com/\ cache.example.com:3128
 Tests the remote Web proxy-cache and asks a Web page. Note that you must
 indicate the whole URL.
+.IP echoping\ -n\ 3\ -m\ whois\ foobar.example.com\ -d\ tao.example.org
+Loads the whois plugin and query the host foobar.example.com. "-d
+tao.example.org" are options specific to the whois plugin.
 .IP echoping\ -u\ \-P\ 0xa0\ foobar.example.com
 Sends several UDP Echo packets with an IP Precedence of 5.
 .SH IP TYPE OF SERVICE OCTET
@@ -193,11 +225,15 @@ values (precedence on Linux, for instance).
 
 .SH BUGS
 
-See the TODO file or SourceForge bug tracking system at
-<http://sourceforge.net/bugs/?group_id=4581>.
+See SourceForge bug tracking system at
+<http://sourceforge.net/tracker/?group_id=4581&atid=104581>.
 
 .SH SEE ALSO
 See the README for information about other network measurements programs.
 
+.SH FILES
+.IP "\fB@plugins_dir@ \fR" 4
+Plugins directory
+
 .SH AUTHOR
 Stephane Bortzmeyer <bortz@users.sourceforge.net>

SRC/echoping.h

@@ -9,16 +9,13 @@
 /* Settings you can change */
 
 #define DEFLINE 256
-#define MAXLINE 65535
 #define UDPMAX 65535
-#ifdef HTTP
+/* Mostly for HTTP */
 #define MAXTOREAD 150000
-#endif
 #ifdef SMTP
 #define MAXSMTP 1024
 #define MAXSMTPLINES 30
 #endif
-#define MAXNUMBER 20
 
 /* Probably too many inclusions but this is to keep 'gcc -Wall' happy... */
 #include	<stdio.h>
@@ -26,6 +23,7 @@
 #include	<sys/types.h>
 #include	<netdb.h>
 #include	<sys/socket.h>
+#include        <netinet/tcp.h>
 #include	<netinet/in.h>
 #include	<arpa/inet.h>
 #include        <stdarg.h>
@@ -35,6 +33,10 @@
 #include        <string.h>
 #include        <signal.h>
 #include        <math.h>
+#include        <dlfcn.h>
+
+/* popt library */
+#include        <popt.h>
 
 #ifdef OPENSSL
 #include <openssl/crypto.h>
@@ -45,6 +47,15 @@
 #include <openssl/rand.h>
 #endif /* OpenSSL */
 
+#ifdef GNUTLS
+#include <gnutls/gnutls.h>
+#endif
+
+#ifdef LIBIDN
+#include <stringprep.h>		/* stringprep_locale_to_utf8() */
+#include <idna.h>		/* idna_to_ascii_from_utf8() */
+#endif
+
 #ifndef FALSE
 #define FALSE 0
 #endif
@@ -69,9 +80,6 @@
 
 /* These entities should be in errno.h but some systems do not define
    them. */
-#ifdef DECL_SYS_ERRLIST
-extern char *sys_errlist[];
-#endif
 #ifdef DECL_SYS_NERR
 extern int sys_nerr;
 #endif
@@ -80,9 +88,6 @@ extern int sys_nerr;
 #ifdef HAVE_SIGACTION
 #define USE_SIGACTION 1
 #endif
-#ifdef HAVE_TTCP
-#define USE_TTCP 1
-#endif
 #ifdef HAVE_TOS
 #define USE_TOS 1
 #endif
@@ -98,14 +103,50 @@ typedef union _CHANNEL
 #ifdef OPENSSL
   SSL *ssl;
 #endif
+#ifdef GNUTLS
+  gnutls_session tls;
+#endif
 }
 CHANNEL;
 
+/* Do not use "short" for "boolean" because popt does not know this
+   type. On a little-endian machine without alignment issues, it may
+   work but not, for instance, on UltraSparc platforms. See for
+   instance Debian bug #254322. */
+typedef unsigned int boolean;
+
 struct result
 {
-  unsigned short valid;
+  boolean valid;
   struct timeval timevalue;
 };
+
+boolean timeout_flag;
+struct echoping_struct
+{
+  boolean udp;			/* Use the UDP protocol (TCP is the default) */
+  boolean ttcp;
+  boolean only_ipv4;
+  boolean only_ipv6;
+  boolean verbose;
+};
+typedef struct echoping_struct echoping_options;
+#ifndef IN_PLUGIN
+/* The functions we will find in the plugin */
+/* Initializes the plugin with its arguments. Returns the port name or number or NULL if the plugin wants to use the raw interface. */
+typedef char *(*init_f) (const int argc, const char **argv,
+			 const echoping_options global_options);
+init_f plugin_init;
+typedef void (*start_f) (struct addrinfo *);
+start_f plugin_start;
+typedef void (*start_raw_f) ();
+start_raw_f plugin_raw_start;
+typedef int (*execute_f) ();
+execute_f plugin_execute;
+typedef void (*terminate_f) ();
+terminate_f plugin_terminate;
+#endif
+
 #endif
 
 struct timeval null_timeval;
@@ -114,9 +155,9 @@ struct timeval max_timeval;
 #define	ECHO_TCP_PORT	"echo"
 #define	DISCARD_TCP_PORT	"discard"
 #define	CHARACTER_GENERATOR_TCP_PORT	"chargen"
-#define DEFAULT_HTTP_TCP_PORT "HTTP"
-#define DEFAULT_HTTPS_TCP_PORT "HTTPS"
-#define DEFAULT_ICP_UDP_PORT "ICP"
+#define DEFAULT_HTTP_TCP_PORT "http"
+#define DEFAULT_HTTPS_TCP_PORT "https"
+#define DEFAULT_ICP_UDP_PORT "icp"
 
 #ifdef HTTP
 /* Use the old HTTP 1.0 protocol? If yes, set HTTP10 to 1*/
@@ -133,6 +174,9 @@ struct timeval max_timeval;
 #define CHARGENERATED " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefg";
 
 char *server;
+#ifdef LIBIDN
+char *locale_server, *ace_server, *utf8_server;
+#endif
 
 /* My functions */
 
@@ -149,6 +193,9 @@ int readline ();
 #ifdef OPENSSL
 int SSL_readline ();
 #endif
+#ifdef GNUTLS
+int TLS_readline ();
+#endif
 /* util.c */
 char *random_string ();
 void tvsub ();
@@ -158,6 +205,7 @@ void tvmin ();
 void tvmax ();
 int tvcmp ();
 void tvstddev ();
+void tvstddevavg ();
 double tv2double ();
 struct timeval double2tv ();
 /* http.c */
@@ -165,7 +213,7 @@ struct timeval double2tv ();
 char *make_http_sendline ();
 void find_server_and_port ();
 /* This one has prototypes, for a very subtile compiler issue. */
-int read_from_server (CHANNEL fs, short ssl);
+int read_from_server (CHANNEL fs, short ssl, boolean accept_redirects);
 #endif
 
 #ifdef ICP
@@ -183,7 +231,9 @@ int smtp_read_response_from_server ();
 
 extern char *progname;
 
-extern unsigned short timeout_flag;
+extern boolean timeout_flag;
+
+#include "compilation.h"
 
 #ifndef HEADER_INCLUDED
 #define HEADER_INCLUDED

SRC/echoping.spec

@@ -2,16 +2,17 @@
 
 Summary: Program to test network services
 Name: echoping
-Version: 4.1.0
+Version: 6.0.0
 Release: 1
 Copyright: GNU
 Group: Utilities/Network
-Source0: echoping-4.1.0.tar.gz
-Url: http://echoping.sourceforge.net
-BuildRoot: /var/tmp/echoping
-Requires: openssl
-BuildRequires: openssl-devel openssl 
-
+Packager: Stephane Bortzmeyer <bortz@users.sourceforge.net>
+Source:  https://github.com/bortzmeyer/echoping/archive/master.zip
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Url: http://bortzmeyer.github.io/echoping/
+Prefix: /usr/local
+# Requires: openssl
+# BuildRequires: openssl-devel openssl 
 
 %description
 
@@ -19,14 +20,12 @@ BuildRequires: openssl-devel openssl
 of a remote host by sending it TCP "echo" (or other protocol, like
 HTTP) packets.
 
-
-
 %prep
 
-%setup -q -n echoping-4.1.0
+%setup  -q # -n %{name}-%{version}
 
 %build
-../configure --prefix=/usr/ --enable-http --enable-icp --enable-smtp --enable-ttcp --with-ssl
+./configure --prefix=$RPM_BUILD_ROOT/usr/local --enable-http --enable-icp --enable-smtp 
 make
 
 
@@ -34,17 +33,19 @@ make
 rm -rf $RPM_BUILD_ROOT
 
 %install
-../configure --prefix=$RPM_BUILD_ROOT/usr/ --with-ssl --enable-http --enable-icp --enable-smtp --enable-ttcp
-make  install
+make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %files
 /
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog DETAILS INSTALL NEWS README TODO 
+%doc AUTHORS COPYING ChangeLog DETAILS  NEWS README TODO 
+%doc %{_mandir}/man1/echoping.1*
 %doc  test-echoping-crypto    test-echoping-icp   test-echoping-local   test-echoping-remote
 
 %changelog
+* Wed Jun 30 2004 - cougar@random.ee
+- Merge
 * Thu Feb 20 2001 Paco <francisco.monserrat@rediris.es>
 -  RPM package
 

SRC/error.c

@@ -5,9 +5,9 @@
 /* Most of error-handling routines stolen from Stevens' books */
 
 void
-my_perror ()
+my_perror()
 {
-  fprintf (stderr, " %s\n", sys_err_str ());
+    fprintf(stderr, " %s\n", sys_err_str());
 }
 
 /*
@@ -20,20 +20,20 @@ my_perror ()
 
 /* VARARGS1 */
 void
-err_ret (char *str, ...)
+err_ret(char *str, ...)
 {
-  va_list args;
+    va_list         args;
 
-  va_start (args, str);
-  vfprintf (stderr, str, args);
-  va_end (args);
+    va_start(args, str);
+    vfprintf(stderr, str, args);
+    va_end(args);
 
-  my_perror ();
+    my_perror();
 
-  fflush (stdout);
-  fflush (stderr);
+    fflush(stdout);
+    fflush(stderr);
 
-  return;
+    return;
 }
 
 /*
@@ -47,16 +47,16 @@ err_ret (char *str, ...)
 
 /* VARARGS1 */
 void
-err_quit (char *str, ...)
+err_quit(char *str, ...)
 {
-  va_list args;
+    va_list         args;
 
-  va_start (args, str);
-  vfprintf (stderr, str, args);
-  fputc ('\n', stderr);
-  va_end (args);
+    va_start(args, str);
+    vfprintf(stderr, str, args);
+    fputc('\n', stderr);
+    va_end(args);
 
-  exit (1);
+    exit(1);
 }
 
 /*
@@ -71,26 +71,25 @@ err_quit (char *str, ...)
 
 /* VARARGS1 */
 void
-err_sys (char *str, ...)
+err_sys(char *str, ...)
 {
-  va_list args;
+    va_list         args;
 
-  va_start (args, str);
-  vfprintf (stderr, str, args);
-  va_end (args);
+    va_start(args, str);
+    vfprintf(stderr, str, args);
+    va_end(args);
 
-  my_perror ();
+    my_perror();
 
-  exit (1);
+    exit(1);
 }
 
 void
-usage ()
+usage(poptContext context)
 {
-  fprintf (stderr,
-	   "Usage: %s [-4] [-6] [-v] [-r] [-f fill] [-t timeout] [-c] [-d] [-u] [-s size] [-n number] [-w delay] [-h url] [-i url] [-p priority] [-P tos] [-C] [-S] hostname[:port]\n",
-	   progname);
-  exit (1);
+    poptPrintUsage(context, stderr, 0);
+    fprintf(stderr, " hostname [plugin-options...]\n");
+    exit(1);
 }
 
 /*
@@ -103,22 +102,15 @@ usage ()
  * decimal value of errno to the other system. 
  */
 
-char *
-sys_err_str ()
+char           *
+sys_err_str()
 {
-  static char msgstr[200];
-
-  if (errno != 0)
-    {
-      if (errno > 0 && errno < sys_nerr)
-	sprintf (msgstr, "(%s)", sys_errlist[errno]);
-      else
-	sprintf (msgstr, "(errno = %d)", errno);
-    }
-  else
-    {
-      msgstr[0] = '\0';
-    }
+    static char     msgstr[200];
 
-  return (msgstr);
+    if (errno != 0) {
+        sprintf(msgstr, "(%s)", strerror(errno));
+    } else {
+        msgstr[0] = '\0';
+    }
+    return (msgstr);
 }

SRC/http.c

@@ -6,113 +6,148 @@
 #include "HTParse.h"
 
 
-char big_recvline[MAXTOREAD];
+char            big_recvline[MAXTOREAD];
 
-char *
-make_http_sendline (char *url, char *host, int port, int nocache)
+char           *
+make_http_sendline(char *url, char *host, int port, int nocache)
 {
-  short sport = (short) port;
-  int size = 200;		/* Enough? */
-  char *sendline = (char *) malloc (size);
-  char *hostname = (char *) malloc (size);
-  char *cache_directive = "";
+    short           sport = (short) port;
+    int             size = 350; /* Enough? RFC 2616, section 3.2.1 says 255 should
+                                 * be enough, although there is no hard limit. We
+                                 * reserve more because there * are the protocol
+                                 * elements, the HTTP headers, etc */
+    char           *sendline = (char *) malloc(size);
+    char           *hostname = (char *) malloc(size);
+    char           *cache_directive = "";
+    int             result;
 #ifdef HTTP10
-  if (nocache)
-    cache_directive = "Pragma: no-cache\r\n";	/* RFC 1945, "Hypertext
-						   Transfer Protocol --
-						   HTTP/1.0" */
-  sprintf (sendline,
-	   "GET %s HTTP/1.0\r\nUser-Agent: Echoping/%s\r\n%s\r\n",
-	   url, VERSION, cache_directive);
+    if (nocache)
+        cache_directive = "Pragma: no-cache\r\n";       /* RFC 1945, "Hypertext
+                                                         * Transfer Protocol * --
+                                                         * HTTP/1.0" */
+    result = snprintf(sendline, size,
+                      "GET %s HTTP/1.0\r\nUser-Agent: Echoping/%s\r\n%s\r\n",
+                      url, VERSION, cache_directive);
 #else
-  if (nocache)
-    {
-      if (nocache == 1)
-	cache_directive = "Cache-control: max-age=0\r\n";	/* Simply force a
-								   recheck with the
-								   server */
-      else
-	cache_directive = "Cache-control: no-cache\r\n";	/* RFC 2616
-								   "Hypertext
-								   Transfer
-								   Protocol --
-								   HTTP/1.1" */
+    if (nocache) {
+        if (nocache == 1)
+            cache_directive = "Cache-control: max-age=0\r\n";   /* Simply force a
+                                                                 * recheck with
+                                                                 * the server */
+        else
+            cache_directive = "Cache-control: no-cache\r\n";    /* RFC 2616
+                                                                 * "Hypertext
+                                                                 * Transfer Protocol 
+                                                                 * -- HTTP/1.1" */
     }
-  strcpy (hostname, HTParse (url, "", PARSE_HOST));
-  if (!strcmp (hostname, ""))
-    sprintf (hostname, "%s:%d", host, sport);
-  sprintf (sendline,
-	   "GET %s HTTP/1.1\r\nUser-Agent: Echoping/%s\r\nHost: %s\r\nConnection: close\r\n%s\r\n",
-	   url, VERSION, hostname, cache_directive);
-  free (hostname);
+    strncpy(hostname, HTParse(url, "", PARSE_HOST), size);      /* See bug #1688940
+                                                                 * to see why we use 
+                                                                 * * * strNcpy. */
+    hostname[size] = '\0';      /* Not added automatically */
+    if (!strcmp(hostname, ""))
+        snprintf(hostname, size, "%s:%d", host, sport);
+    result = snprintf(sendline, size,
+                      "GET %s HTTP/1.1\r\nUser-Agent: Echoping/%s\r\nHost: %s\r\nConnection: close\r\n%s\r\n",
+                      url, VERSION, hostname, cache_directive);
+    free(hostname);
 #endif
-  return sendline;
+    if (result >= size)
+        err_quit("URL and/or hostname too long(s)");
+    return sendline;
 }
 
 int
-read_from_server (CHANNEL fs, short ssl)
+read_from_server(CHANNEL fs, short ssl, boolean accept_redirects)
 {
-  int nr;
-  int total = 0;
-  char reply_code;
-  int first_line = TRUE;
-  short body = FALSE;
+    int             nr = 0;
+    int             total = 0;
+    int             reply_code;
+    int             first_line = TRUE;
+    short           body = FALSE;
 #ifdef OPENSSL
-  int sslcode;
+    int             sslcode;
 #endif
-  while (!body)
-    {
-      if (!ssl)
-	nr = readline (fs.fs, big_recvline, MAXTOREAD, TRUE);
+    while (!body && !timeout_flag) {
+        if (!ssl)
+            nr = readline(fs.fs, big_recvline, MAXTOREAD, TRUE);
 #ifdef OPENSSL
-      else
-	{
-	  nr = SSL_readline (fs.ssl, big_recvline, MAXTOREAD, TRUE);
-	  if (nr == -1)
-	    {
-	      sslcode = ERR_get_error ();
-	      err_ret ("SSL_readline error: %s",
-		       ERR_error_string (sslcode, NULL));
-	    }
-	}
+        else {
+            nr = SSL_readline(fs.ssl, big_recvline, MAXTOREAD, TRUE);
+            if (nr == -1) {
+                sslcode = ERR_get_error();
+                err_ret("SSL_readline error: %s", ERR_error_string(sslcode, NULL));
+            }
+        }
 #endif
-      /* printf ("DEBUG: reading \"%s\"\n (%d chars)\n", big_recvline, nr);  */
-      /* HTTP replies should be separated by CR-LF. Unfortunately, some
-         servers send only CR :-( */
-      body = ((nr == 2) || (nr == 1));	/* Empty line CR-LF seen */
-      if ((nr < 1) && (errno == EINTR))	/* Probably a timeout */
-	return -1;
-      if (nr < 1)
-	/* SourceForge bug #109385 */
-	/* err_sys ("Error reading HTTP header"); */
-	return -1;
-      /* if ((int) big_recvline[nr-1] == 10)
-         nr--; */
-      if (first_line)
-	{
-	  reply_code = big_recvline[9];	/* 9 because "HTTP/1.x 200..." */
-	  if (reply_code != '2')	/* Status codes beginning with 3 are not errors
-					   but should never appear in reply to echoping's requests */
-	    err_quit ("HTTP error \"%s\"", big_recvline);
-	}
-      total = total + nr;
-      first_line = FALSE;
+#ifdef GNUTLS
+        else
+        {
+            nr = TLS_readline(fs.tls, big_recvline, MAXTOREAD, TRUE);
+            if (nr == -1) {
+                err_ret("TLS_readline error: %s", gnutls_strerror(nr));
+            }
+        }
+#endif
+        /* 
+         * printf ("DEBUG: reading \"%s\"\n (%d chars)\n",
+         * big_recvline, nr);
+         */
+        /* 
+         * HTTP replies should be separated by CR-LF. Unfortunately,
+         * some servers send only CR :-(
+         */
+        body = ((nr == 2) || (nr == 1));        /* Empty line CR-LF seen */
+        if ((nr < 1) && (timeout_flag)) /* Probably a timeout */
+            return -1;
+        if (nr < 1)
+            /* SourceForge bug #109385 */
+            /* err_sys ("Error reading HTTP header"); */
+            return -1;
+        /* 
+         * if ((int) big_recvline[nr-1] == 10) nr--;
+         */
+        if (first_line) {
+            /* sscanf parse "HTTP/1.x 200" */
+            sscanf(big_recvline,"%*s %d", &reply_code);
+
+            /* 204 No Content is not an error, message body is empty by definition, see RFC 2616 */
+            if (reply_code == 204)
+                return 0;       /* zero bytes is correct */
+
+            if (!  (reply_code >= 200 && reply_code < 300) &&
+                ! ((reply_code >= 300 && reply_code < 400) && accept_redirects))
+                /* 
+                 * Status codes beginning with 3 are not
+                 * errors See bug #850674 and RFC 2616,
+                 * section 10.3
+                 */
+                err_quit("HTTP error \"%s\"", big_recvline);
+        }
+        total = total + nr;
+        first_line = FALSE;
     }
-  /* Read the body */
-  if (!ssl)
-    nr = readline (fs.fs, big_recvline, MAXTOREAD, FALSE);
+    /* Read the body */
+    if (!ssl)
+        nr = readline(fs.fs, big_recvline, MAXTOREAD, FALSE);
 #ifdef OPENSSL
-  else
-    nr = SSL_readline (fs.ssl, big_recvline, MAXTOREAD, FALSE);
+    else
+        nr = SSL_readline(fs.ssl, big_recvline, MAXTOREAD, FALSE);
+#endif
+#ifdef GNUTLS
+    else
+    nr = TLS_readline(fs.tls, big_recvline, MAXTOREAD, FALSE);
 #endif
-  /* printf ("DEBUG: reading body \"%s\"\n (%d chars)\n", big_recvline, nr);  */
-  if ((nr < 2) && (errno == EINTR))	/* Probably a timeout */
-    return -1;
-  if (nr < 2)			/* Hmm, if the body is empty, we'll
-				   get a meaningless error message */
-    err_sys ("Error reading HTTP body");
-  total = total + nr;
-  return total;			/* How to do if we want only the body's size? */
+    /* 
+     * printf ("DEBUG: reading body \"%s\"\n (%d chars)\n", big_recvline,
+     * nr);
+     */
+    if ((nr < 2) && (timeout_flag))     /* Probably a timeout */
+        return -1;
+    if (nr < 2)                 /* Hmm, if the body is empty, we'll get a * * * * *
+                                 * * * meaningless error message */
+        err_sys("Error reading HTTP body");
+    total = total + nr;
+    return total;               /* How to do if we want only the body's size? */
 }
 
-#endif /* HTTP */
+#endif                          /* HTTP */

SRC/icp.c

@@ -11,97 +11,96 @@
 #ifdef ICP
 
 
-void *
-make_icp_sendline (url, shost, opcode, length)
-     const char *url;
-     u_num32 *shost;
-     icp_opcode opcode;
-     int *length;
+void           *
+make_icp_sendline(url, shost, opcode, length)
+    const char     *url;
+    u_num32        *shost;
+    icp_opcode      opcode;
+    int            *length;
 
 {
-  icp_common_t *headerp = NULL;
-  char *buf = NULL;
-  char *urloffset = NULL;
-  u_num32 flags = ICP_FLAG_SRC_RTT;
-  u_num32 pad = 0;
-  u_num32 reqnum = 4711;
-  unsigned short buf_len;
+    icp_common_t   *headerp = NULL;
+    char           *buf = NULL;
+    char           *urloffset = NULL;
+    u_num32         flags = ICP_FLAG_SRC_RTT;
+    u_num32         pad = 0;
+    u_num32         reqnum = 4711;
+    unsigned short  buf_len;
 
-  buf_len = sizeof (icp_common_t) + strlen (url) + 1;
-  if (opcode == ICP_OP_QUERY)
-    buf_len += sizeof (u_num32);
-  buf = calloc (buf_len, 1);
-  headerp = (icp_common_t *) buf;
-  headerp->opcode = opcode;
-  headerp->version = ICP_VERSION_CURRENT;
-  headerp->length = htons (buf_len);
-  headerp->reqnum = htonl (reqnum);
-  headerp->flags = htonl (flags);
-  headerp->pad = pad;
-  if (shost)
-    headerp->shostid = htonl (*shost);
-  /* urloffset = (char *) ((int) buf + sizeof(icp_common_t)); */
-  urloffset = (char *) (buf + sizeof (icp_common_t));
-  if (opcode == ICP_OP_QUERY)
-    urloffset += sizeof (u_num32);
-  memcpy (urloffset, url, strlen (url));
-  *length = buf_len;
-  return buf;
+    buf_len = sizeof(icp_common_t) + strlen(url) + 1;
+    if (opcode == ICP_OP_QUERY)
+        buf_len += sizeof(u_num32);
+    buf = calloc(buf_len, 1);
+    headerp = (icp_common_t *) buf;
+    headerp->opcode = opcode;
+    headerp->version = ICP_VERSION_CURRENT;
+    headerp->length = htons(buf_len);
+    headerp->reqnum = htonl(reqnum);
+    headerp->flags = htonl(flags);
+    headerp->pad = pad;
+    if (shost)
+        headerp->shostid = htonl(*shost);
+    /* urloffset = (char *) ((int) buf + sizeof(icp_common_t)); */
+    urloffset = (char *) (buf + sizeof(icp_common_t));
+    if (opcode == ICP_OP_QUERY)
+        urloffset += sizeof(u_num32);
+    memcpy(urloffset, url, strlen(url));
+    *length = buf_len;
+    return buf;
 }
 
 int
-recv_icp (sockfd, buf, retcode)
-     int sockfd;
-     char *buf;
-     char *retcode;
+recv_icp(sockfd, buf, retcode)
+    int             sockfd;
+    char           *buf;
+    char           *retcode;
 
-{				/*
-				 * based on draft-wessels-icp-v2-02.txt 
-				 */
-  icp_common_t *headerp = (icp_common_t *) buf;
-  int nr, length;
-  unsigned char opcode;
-  static char *icp_op_code[] = {
-    /*  0 */ "ICP_OP_INVALID",
-    /*  1 */ "ICP_OP_QUERY",
-    /*  2 */ "ICP_OP_HIT",
-    /*  3 */ "ICP_OP_MISS",
-    /*  4 */ "ICP_OP_ERR",
-    /*  5 */ "",
-    /*  6 */ "",
-    /*  7 */ "",
-    /*  8 */ "",
-    /*  9 */ "",
-    /* 10 */ "ICP_OP_SECHO",
-    /* 11 */ "ICP_OP_DECHO",
-    /* 12 */ "",
-    /* 13 */ "",
-    /* 14 */ "",
-    /* 15 */ "",
-    /* 16 */ "",
-    /* 17 */ "",
-    /* 18 */ "",
-    /* 19 */ "",
-    /* 20 */ "",
-    /* 21 */ "ICP_OP_MISS_NOFETCH",
-    /* 22 */ "ICP_OP_DENIED",
-    /* 23 */ "ICP_OP_HIT_OBJ"
-  };
+{                               /* 
+                                 * based on draft-wessels-icp-v2-02.txt 
+                                 */
+    icp_common_t   *headerp = (icp_common_t *) buf;
+    int             nr, length;
+    unsigned char   opcode;
+    static char    *icp_op_code[] = {
+        /* 0 */ "ICP_OP_INVALID",
+        /* 1 */ "ICP_OP_QUERY",
+        /* 2 */ "ICP_OP_HIT",
+        /* 3 */ "ICP_OP_MISS",
+        /* 4 */ "ICP_OP_ERR",
+        /* 5 */ "",
+        /* 6 */ "",
+        /* 7 */ "",
+        /* 8 */ "",
+        /* 9 */ "",
+        /* 10 */ "ICP_OP_SECHO",
+        /* 11 */ "ICP_OP_DECHO",
+        /* 12 */ "",
+        /* 13 */ "",
+        /* 14 */ "",
+        /* 15 */ "",
+        /* 16 */ "",
+        /* 17 */ "",
+        /* 18 */ "",
+        /* 19 */ "",
+        /* 20 */ "",
+        /* 21 */ "ICP_OP_MISS_NOFETCH",
+        /* 22 */ "ICP_OP_DENIED",
+        /* 23 */ "ICP_OP_HIT_OBJ"
+    };
 
 
-  nr = recvfrom (sockfd, buf, DEFLINE, 0, (struct sockaddr *) 0, (int *) 0);
-  if (nr < 0)
-    {
-      if (timeout_flag)
-	err_quit ("Timeout while reading");
-      else
-	err_sys ("No reply from ICP proxy server");
+    nr = recvfrom(sockfd, buf, DEFLINE, 0, (struct sockaddr *) 0, (int *) 0);
+    if (nr < 0) {
+        if (timeout_flag)
+            err_quit("Timeout while reading");
+        else
+            err_sys("No reply from ICP proxy server");
     }
-  opcode = headerp->opcode;
-  length = ntohs (headerp->length);
-  sprintf (retcode, "ICP reply: \42%s\42", icp_op_code[opcode]);
-  return length;
+    opcode = headerp->opcode;
+    length = ntohs(headerp->length);
+    sprintf(retcode, "ICP reply: \42%s\42", icp_op_code[opcode]);
+    return length;
 }
 
 
-#endif /* ICP */
+#endif                          /* ICP */

SRC/icp.h

@@ -11,10 +11,12 @@
 #define ICP_FLAG_HIT_OBJ	0x80000000ul
 #define ICP_FLAG_SRC_RTT	0x40000000ul
 
-#ifdef __alpha__
+#if SIZEOF_INT == 4
 typedef unsigned int u_num32;
-#else
+#elif SIZEOF_LONG == 4
 typedef unsigned long u_num32;
+#else
+#error "No suitable type for representing a 32-bits value"
 #endif
 
 struct icp_common_s {

SRC/misc/test-long-urls

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Bug 1688940
+
+# OK
+./echoping -v -h "/?query=0123456789656565864854129568977808708770878781672766762766742213542786502345617812784576590234567890123456784455644855856556697867566473432623422345678901234567890123478901234567565719787867155665376556472234516542568425446852434177664277876766" www.james.rcpt.to 
+
+echo ""
+
+# Too long
+./echoping -v -h "/?query=01234567896565658648541295689778087087708787816727667627667422135427865023456178127845765901234567890123456784455644855856556697867566473432623422345678901234567890123478901234567565719787867155665376556472234516542568425446852434177664277876766" www.james.rcpt.to 

SRC/missing

@@ -1,190 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program 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 2, or (at your option)
-# any later version.
-
-# This program 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing - GNU libit 0.0"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`configure.in'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`configure.in'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`configure.in'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0

SRC/mkinstalldirs

@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id$
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here

SRC/plugins/Makefile.am

@@ -0,0 +1,12 @@
+SUBDIRS=@subdirs@
+CONFIGURE_DEPENDENCIES=list-of-dirs.m4 ../configure-common.ac configure-plugins.ac
+
+list-of-dirs.m4: 
+	@echo "dnl Created automatically on `date`" > $@
+	for file in `ls | grep -v CVS | grep -v autom4te`; do \
+		if test -d $$file; then \
+			echo "if test \"\$$$${file}_BUILD\" = 1; then" >> $@ ; \
+			echo "  AC_CONFIG_SUBDIRS($$file)" >> $@ ; \
+			echo "fi" >> $@ ; \
+		fi \
+	done

SRC/plugins/configure-plugins.ac

@@ -0,0 +1,31 @@
+LIBIDN=1
+AC_ARG_WITH(libidn,
+ [  --with-libidn[=DIR]   Internationalized Domain Names support (needs GNU libidn)],dnl
+ [if test "$withval" != "no"; then
+   if test "$withval" != "yes"; then
+	IDNROOT=$withval
+	LDFLAGS="${LDFLAGS} -L$IDNROOT/lib"
+        CPPFLAGS="${CPPFLAGS} -I$IDNROOT/include"  
+   fi
+ else
+   LIBIDN=0
+ fi],
+)
+if test "$LIBIDN" = "1"; then
+AC_DEFINE(LIBIDN,,[Internationalized Domain Names support])
+fi
+
+AC_ARG_WITH(popt,
+ [  --with-popt[=DIR]  popt command-line parsing library],dnl
+ [if test "$withval" != "no"; then
+   if test "$withval" != "yes"; then
+        POPTROOT=$withval
+        LDFLAGS="${LDFLAGS} -L$POPTROOT/lib"
+        CPPFLAGS="${CPPFLAGS} -I$POPTROOT/include"  
+   fi
+  else
+        AC_MSG_ERROR([The popt command-line parsing library is mandatory for this plugin])
+ fi],
+)
+
+dnl $Id$

SRC/plugins/configure.ac

@@ -0,0 +1,29 @@
+dnl $Id$
+
+m4_include(../configure-common.ac)
+AM_INIT_AUTOMAKE(foreign)
+dnl TODO: write a XML-RPC plugin for Adamsnames' interface. See a first version in contrib/
+AC_ARG_ENABLE(plugin,
+[  --enable-plugin=LIST  Build only the following plugins],
+[if test "$enableval" = "no"; then
+   AC_MSG_ERROR([You cannot disable plugin support])
+else
+   if test "$enableval" = "yes"; then
+      AC_MSG_ERROR([You must indicate a list of plugins with this option])
+   else
+      plugins=$enableval
+   fi
+fi],
+plugins="random whois dns postgresql ldap")
+for plugin in $plugins; do
+  if test ! -d $srcdir/$plugin ; then
+    AC_MSG_ERROR([No such plugin $plugin])
+  fi
+  eval ${plugin}_BUILD=1
+done
+m4_include(list-of-dirs.m4)
+plugins_dir=`cat dir`
+AC_SUBST(plugins_dir)
+AC_OUTPUT(Makefile)
+echo ""
+echo Plugins to build: $plugins

SRC/plugins/dns/Makefile.am

@@ -0,0 +1,9 @@
+if DNSBUILD
+pkglib_LTLIBRARIES = dns.la
+dns_la_SOURCES = dns.c
+dns_la_LDFLAGS = -module
+endif
+
+man_MANS = echoping_dns.1
+
+EXTRA_DIST = $(man_MANS)

SRC/plugins/dns/configure.ac

@@ -0,0 +1,56 @@
+dnl $Id$
+
+m4_include([../../configure-common.ac])
+AM_INIT_AUTOMAKE(foreign)
+AC_CONFIG_HEADERS(config.h)
+
+m4_include([../configure-plugins.ac])
+
+DNS_BUILD=1
+AC_CHECK_FUNCS(poptGetContext,, 
+   [AC_CHECK_LIB(popt,poptGetContext,,[AC_MSG_WARN([No popt development environment found, not building this plugin]) && DNS_BUILD=0])])
+if test "$DNS_BUILD" != "0"; then
+
+ AC_CHECK_FUNC(res_mkquery, , 
+  [AC_CHECK_LIB(bind, res_mkquery, , 
+   [AC_CHECK_LIB(resolv, res_mkquery, , 
+dnl http://bugs.debian.org/254089
+	[ saved_LIBS="$LIBS"
+	LIBS="$LIBS -lresolv"
+	AC_MSG_CHECKING(for res_mkquery in -lresolv again)
+	AC_LINK_IFELSE([[
+#include <resolv.h>
+int main()
+{
+	res_mkquery (0, 0, 0, 0, 0, 0, 0, 0, 0);
+	return 0;
+}]],
+	LIBS="$saved_LIBS -lresolv"; AC_MSG_RESULT(yes),
+	LIBS="$saved_LIBS"; AC_MSG_RESULT(no)
+        [AC_MSG_WARN([No DNS resolver development environment found, not building this plugin]) && DNS_BUILD=0])])])])
+fi
+
+AC_MSG_CHECKING([_res ])
+AC_TRY_LINK([#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>],
+              [_res.options = RES_INIT;],
+                 AC_DEFINE(HAVE_RES, , [Define if you have the _res variable]) 
+                 AC_MSG_RESULT(yes), 
+               AC_MSG_RESULT(no));
+AC_MSG_CHECKING([_res_ext ])
+AC_TRY_LINK([#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>],
+              [_res_ext.nsaddr_list[0].ss_family = AF_INET6;],
+                 AC_DEFINE(HAVE_RES_EXT, , [Define if you have the _res_ext variable (for IPv6)]) 
+                 AC_MSG_RESULT(yes), 
+               AC_MSG_RESULT(no));
+
+AM_CONDITIONAL(DNSBUILD, test "$DNS_BUILD" = 1)
+AC_OUTPUT(Makefile)
+

SRC/plugins/dns/dns.c

@@ -0,0 +1,215 @@
+/*
+ * DNS plugin. $Id$
+ */
+
+#define IN_PLUGIN
+#include "../../echoping.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
+struct addrinfo name_server;
+poptContext     dns_poptcon;
+char           *request;
+int             type;
+char           *type_name = NULL;
+boolean         use_tcp = FALSE;
+boolean         no_recurse = FALSE;
+
+/* nsError stolen from Liu & Albitz check_soa (in their book "DNS and BIND") */
+
+/****************************************************************
+ * nsError -- Print an error message from h_errno for a failure *
+ *     looking up NS records.  res_query() converts the DNS     *
+ *     packet return code to a smaller list of errors and       *
+ *     places the error value in h_errno.  There is a routine   *
+ *     called herror() for printing out strings from h_errno    *
+ *     like perror() does for errno.  Unfortunately, the        *
+ *     herror() messages assume you are looking up address      *
+ *     records for hosts.  In this program, we are looking up   *
+ *     NS records for domains, so we need our own list of error *
+ *     strings.                                                 *
+ ****************************************************************/
+int
+nsError(error, domain)
+    int             error;
+    char           *domain;
+{
+    switch (error) {
+    case HOST_NOT_FOUND:
+        err_ret("Unknown domain: %s\n", domain);
+        return -1;
+    case NO_DATA:
+        err_ret("No records of type %s for %s in the Answer section\n",
+                to_upper(type_name), domain);
+        return -1;
+    case TRY_AGAIN:
+        err_ret("No response for query\n");
+        return -2;
+    default:
+        err_ret("Unexpected error\n");
+        return -1;
+    }
+}
+
+void
+dns_usage(const char *msg)
+{
+    if (msg) {
+        fprintf(stderr, "Error: %s\n", msg);
+    }
+    poptPrintUsage(dns_poptcon, stderr, 0);
+    fprintf(stderr, "  request\n");
+    exit(1);
+}
+
+char           *
+init(const int argc, const char **argv)
+{
+    int             value;
+    char           *hostname;
+    char           *msg = malloc(256);
+    char           *upper_type_name = NULL;
+    /* popt variables */
+    struct poptOption options[] = {
+        {"type", 't', POPT_ARG_STRING, &type_name, 0,
+         "Type of resources queried (A, MX, SOA, etc)",
+         "type"},
+        {"tcp", (char) NULL, POPT_ARG_NONE, &use_tcp, 0,
+         "Use TCP for the request (virtual circuit)",
+         "tcp"},
+        {"no-recurse", (char) NULL, POPT_ARG_NONE, &no_recurse, 0,
+         "Do not ask recursion",
+         "no-recurse"},
+        POPT_AUTOHELP POPT_TABLEEND
+    };
+    dns_poptcon = poptGetContext(NULL, argc, argv, options, POPT_CONTEXT_KEEP_FIRST);
+    while ((value = poptGetNextOpt(dns_poptcon)) > 0) {
+    }
+    if (value < -1) {
+        sprintf(msg, "%s: %s",
+                poptBadOption(dns_poptcon, POPT_BADOPTION_NOALIAS),
+                poptStrerror(value));
+        dns_usage(msg);
+    }
+    hostname = (char *) poptGetArg(dns_poptcon);        /* Not used */
+    request = (char *) poptGetArg(dns_poptcon);
+    if (request == NULL)
+        dns_usage("Mandatory request missing");
+    if ((type_name == NULL) || !strcmp(type_name, "")) {
+        type = T_A;
+        type_name = "A";
+    } else {
+        upper_type_name = (char *) to_upper(type_name);
+        /* 
+         * TODO: a better algorithm. Use dns_rdatatype_fromtext in
+         * BIND ?
+         */
+        if (!strcmp(upper_type_name, "A"))
+            type = T_A;
+        else if (!strcmp(upper_type_name, "AAAA"))
+            type = T_AAAA;
+        else if (!strcmp(upper_type_name, "NS"))
+            type = T_NS;
+        else if (!strcmp(upper_type_name, "SOA"))
+            type = T_SOA;
+        else if (!strcmp(upper_type_name, "MX"))
+            type = T_MX;
+        else if (!strcmp(upper_type_name, "SRV"))
+            type = T_SRV;
+        else if (!strcmp(upper_type_name, "CNAME"))
+            type = T_CNAME;
+        else if (!strcmp(upper_type_name, "PTR"))
+            type = T_PTR;
+        else if (!strcmp(upper_type_name, "TXT"))
+            type = T_TXT;
+        else if (!strcmp(upper_type_name, "ANY"))
+            type = T_ANY;
+        else
+            dns_usage("Unknown type");
+    }
+    return "domain";
+}
+
+void
+start(struct addrinfo *res)
+{
+    struct sockaddr name_server_sockaddr;
+    struct sockaddr_in name_server_sockaddr_in;
+    struct sockaddr_in6 name_server_sockaddr_in6;
+    name_server = *res;
+    name_server_sockaddr = *name_server.ai_addr;
+    if (name_server_sockaddr.sa_family == AF_INET) {
+        /* Converts a generic sockaddr to an IPv4 sockaddr_in */
+        (void) memcpy((void *) &name_server_sockaddr_in,
+                      &name_server_sockaddr, sizeof(struct sockaddr));
+    } else if (name_server_sockaddr.sa_family == AF_INET6) {
+#ifdef HAVE_RES_EXT
+        /* TODO: the code for IPv6 servers is hopelessly broken. Start again */
+        fprintf(stderr,
+                "WARNING: IPv6 nameservers not really supported yet (experts may apply). Falling back to IPv4 and the default server. You may use -4, too\n");
+        /* Converts a generic sockaddr to an IPv6 sockaddr_in6 */
+        (void) memcpy((void *) &name_server_sockaddr_in6,
+                      &name_server_sockaddr, sizeof(struct sockaddr));
+#else
+        err_quit
+            ("IPv6 name servers not supported on this platform, may be you should use the -4 option");
+#endif
+    } else {
+        err_quit("Unknown family for address of the server");
+    }
+    if (res_init() < 0)
+        err_sys("res_init");
+    if (name_server_sockaddr.sa_family == AF_INET) {
+        _res.nsaddr_list[0] = name_server_sockaddr_in;
+    } else if (name_server_sockaddr.sa_family == AF_INET6) {
+#ifdef HAVE_RES_EXT
+        /* TODO: completely broken, dioes not work. Check in Stevens */
+        (void) memcpy(_res_ext.nsaddr_list, &name_server_sockaddr_in6,
+                      sizeof(struct sockaddr_in6));
+#endif
+    }
+    _res.nscount = 1;
+    _res.options &= ~(RES_DNSRCH | RES_DEFNAMES | RES_NOALIASES);
+    if (use_tcp) {
+        _res.options |= RES_USEVC;
+    }
+    if (no_recurse) {
+        _res.options &= ~RES_RECURSE;
+    }
+}
+
+int
+execute()
+{
+    union {
+        HEADER          hdr;    /* defined in resolv.h */
+        u_char          buf[PACKETSZ];  /* defined in arpa/nameser.h */
+    } response;                 /* response buffers */
+    int             response_length;    /* buffer length */
+    if ((response_length = res_query(request,   /* the domain we care about */
+                                     C_IN,      /* Internet class records */
+                                     type, (u_char *) & response,       /* response
+                                                                         * buffer */
+                                     sizeof(response))) /* buffer size */
+        <0) {                   /* If negative */
+        nsError(h_errno, request);      /* report the error */
+        if (h_errno == TRY_AGAIN)
+            return -1;          /* More luck next time? */
+        else
+            return -2;          /* Give in */
+    }
+    /* 
+     * TODO: better analysis of the replies. For instance, replies can be
+     * in the authority section (delegation info)
+     */
+    return 0;
+}
+
+void
+terminate()
+{
+}

SRC/plugins/dns/echoping_dns.1

@@ -0,0 +1,51 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" $Id$
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ECHOPING_DNS 1 "May 26, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+echoping_dns \- echoping plugin which queries a DNS server
+.SH SYNOPSIS
+.B echoping
+.RI [echoping\ options]
+.RI -m\ dns
+.B hostname
+.B request
+.SH DESCRIPTION
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+dns is an echoping plugin, fo testing the performances of DNS (RFC
+1034 and 1035) servers.
+.SH ARGUMENTS
+.TP
+.B request 
+A domain name
+.SH OPTIONS
+.TP
+.B \-t, \-\-type
+The type of data requested (NS, A, SOA, etc)
+.TP
+.B \-\-no-recurse
+Do not request recursive queries
+.TP
+.B \-\-tcp
+Use only TCP ("virtual circuit")
+.SH SEE ALSO
+.BR echoping (1),
+.SH AUTHOR
+Stephane Bortzmeyer <bortz@users.sourceforge.net>

SRC/plugins/ldap/Makefile.am

@@ -0,0 +1,10 @@
+if LDAPBUILD
+pkglib_LTLIBRARIES = ldap.la
+ldap_la_SOURCES = ldap.c
+ldap_la_LDFLAGS = -module
+endif
+man_MANS = echoping_ldap.1
+
+EXTRA_DIST = $(man_MANS) test.sh
+
+# $Id$

SRC/plugins/ldap/configure.ac

@@ -0,0 +1,19 @@
+dnl $Id$
+
+m4_include([../../configure-common.ac])
+AM_INIT_AUTOMAKE(foreign)
+AC_CONFIG_HEADERS(config.h)
+
+m4_include([../configure-plugins.ac])
+
+LDAP_BUILD=1
+AC_CHECK_FUNCS(poptGetContext,, 
+   [AC_CHECK_LIB(popt,poptGetContext,,[AC_MSG_WARN([No popt development environment found, not building this plugin]) && LDAP_BUILD=0])])
+if test "$LDAP_BUILD" != "0"; then
+AC_CHECK_FUNCS(ldap_open, , 
+   [AC_CHECK_LIB(ldap,ldap_open,,
+      [AC_MSG_WARN([No LDAP development environment found, not building this plugin]) && LDAP_BUILD=0])])
+fi
+AM_CONDITIONAL(LDAPBUILD, test "$LDAP_BUILD" = 1)
+AC_OUTPUT(Makefile)
+

SRC/plugins/ldap/echoping_ldap.1

@@ -0,0 +1,52 @@
+.\" $Id$
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ECHOPING_LDAP 1 "May 26, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+echoping_ldap \- echoping plugin which connects to a LDAP server
+.SH SYNOPSIS
+.B echoping
+.RI [echoping\ options]
+.RI -m\ ldap
+.B hostname
+.RI [-b base]
+.RI [-r request]
+.RI [-s scope]
+.RI [-p port]
+.SH DESCRIPTION
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+ldap is an echoping plugin to connect to LDAP servers.
+.SH OPTIONS
+.TP
+.B \-r request
+The request to the LDAP server, in LDAP filter language. By default (objectclass=*).
+.TP
+.B \-b base
+Base of the search, for instance "dc=current,dc=bugs,dc=debian,dc=org"
+.TP
+.B \-s scope
+Scope of the search, "sub", "one" or "base"
+.TP
+.B \-p port
+TCP port to use
+.SH SEE ALSO
+.BR echoping (1),
+.SH AUTHOR
+Stephane Bortzmeyer <bortz@users.sourceforge.net>

SRC/plugins/ldap/ldap.c

@@ -0,0 +1,163 @@
+/*
+ * LDAP plugin. TODO: loops with and without opening the connection each
+ * time? $Id$
+ */
+
+#define IN_PLUGIN
+#include "../../echoping.h"
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#include "config.h"
+#endif
+#include <ldap.h>
+
+const char     *request = NULL;
+const char     *base = NULL;
+int             scope = LDAP_SCOPE_BASE;
+const char     *hostname;
+int             port = 0;
+LDAP           *session;
+poptContext     ldap_poptcon;
+echoping_options global_options;
+
+void
+ldap_usage(const char *msg)
+{
+    if (msg) {
+        printf("LDAP plugin error: %s\n", msg);
+    }
+    poptPrintUsage(ldap_poptcon, stdout, 0);
+    exit(1);
+}
+
+char           *
+init(const int argc, const char **argv,
+     const echoping_options global_external_options)
+{
+    int             value;
+    char           *msg = malloc(MAX_LINE);
+    char           *rest, *port_text;
+    char           *scope_string = NULL;
+    /* popt variables */
+    struct poptOption options[] = {
+        {"request", 'r', POPT_ARG_STRING, &request, 0,
+         "Request (filter) to send to the LDAP server", "r"},
+        {"base", 'b', POPT_ARG_STRING, &base, 0,
+         "Base of the LDAP tree", "b"},
+        {"scope", 's', POPT_ARG_STRING, &scope_string, 0,
+         "Scope of the search in the LDAP tree (sub, one or base)", "s"},
+        {"port", 'p', POPT_ARG_INT, &port, 0,
+         "TCP port to connect to the LDAP server", "p"},
+        POPT_AUTOHELP POPT_TABLEEND
+    };
+    global_options = global_external_options;
+    if (global_options.udp)
+        err_quit("UDP makes no sense for a LDAP connection");
+    ldap_poptcon = poptGetContext(NULL, argc,
+                                  argv, options, POPT_CONTEXT_KEEP_FIRST);
+    while ((value = poptGetNextOpt(ldap_poptcon)) > 0) {
+    }
+    if (value < -1) {
+        sprintf(msg, "%s: %s",
+                poptBadOption(ldap_poptcon, POPT_BADOPTION_NOALIAS),
+                poptStrerror(value));
+        ldap_usage(msg);
+    }
+    if (port == 0)
+        port = LDAP_PORT;
+    hostname = poptGetArg(ldap_poptcon);
+    rest = poptGetArg(ldap_poptcon);
+    if (rest != NULL) {
+        fprintf(stderr, "%s: ", rest);
+        ldap_usage("Additional arguments");
+    }
+    if (base == NULL)
+        base = "";
+    if (request == NULL || !strcmp(request, ""))
+        request = "(objectclass=*)";    /* Default mentioned in OpenLDAP
+                                         * documentation.  Joerg Roth fears that it
+                                         * may trigger "Size limit exceeded" if
+                                         * there are many objects at this node. RFC
+                                         * 4515 seems silent here. */
+    if (scope_string != NULL) {
+        scope_string = (char *) to_upper(scope_string);
+        if (!strcmp(scope_string, "BASE"))
+            scope = LDAP_SCOPE_BASE;
+        else if (!strcmp(scope_string, "SUB"))
+            scope = LDAP_SCOPE_SUBTREE;
+        else if (!strcmp(scope_string, "ONE"))
+            scope = LDAP_SCOPE_ONELEVEL;
+        else
+            err_quit("Invalid scope \"%s\"", scope_string);
+    }
+    if (port == LDAP_PORT) {
+        return "ldap";
+    } else {
+        port_text = malloc(99);
+        sprintf(port_text, "%d", port);
+        return port_text;
+    }
+}
+
+void
+start()
+{
+    int             result;
+    LDAPMessage    *response;
+
+    session = ldap_init(hostname, port);
+    if (session == NULL)
+        err_sys("Cannot initialize LDAP");
+    /* TODO: allow non-anonymous connections, with ldap_bind_simple_s */
+    /* 
+     * Unfortunately, ldap_init does not connect to the LDAP server. So
+     * connection errors (e.g. firewall), will not be detected here and
+     * loop will go on.
+     * 
+     * To quote the man page: ldap_init() acts just like ldap_open(), but
+     * does not open a connection to the LDAP server.  The actual
+     * connection open will occur when the first operation is attempted.
+     * At this time, ldap_init() is preferred.  ldap_open() will be
+     * depreciated in a later release.
+     * 
+     * So, we perform a dummy search immediately.
+     *  
+     * See #1879652 for why we use "dummystuff" and not "*"
+     *
+     */
+    result = ldap_search_s(session, base, LDAP_SCOPE_ONELEVEL, "(objectClass=dummystuff)", NULL,        /* Return
+                                                                                                         * * all * 
+                                                                                                         * * *
+                                                                                                         * attributes 
+                                                                                                         */
+                           1, &response);
+    if (result != 0) {
+        err_quit
+            ("Cannot connect to %s (no LDAP server or wrong base, probably): %s",
+             hostname, ldap_err2string(result));
+    }
+}
+
+int
+execute()
+{
+    int             result;
+    LDAPMessage    *response;
+    result = ldap_search_s(session, base, scope, request, NULL, /* Return all
+                                                                 * attributes */
+                           0,   /* Return attribute types *and* values */
+                           &response);
+    if (result != 0) {
+        err_ret("Cannot search \"%s\": %s", request, ldap_err2string(result));
+        return -1;
+    }
+    if (global_options.verbose)
+        printf("Retrieved: %d entries\n", ldap_count_entries(session, response));
+    return 0;
+}
+
+void
+terminate()
+{
+    ldap_unbind_s(session);
+}

SRC/plugins/ldap/test.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# $Id$
+
+../../echoping -m ldap -v db.debian.org --base=dc=debian,dc=org --scope=sub
+# TODO: ldapsearch works with the bts2ldap gateway but gq and echoping fail
+#../../echoping -m ldap -v master.debian.org --port=10101 --scope=sub --base='dc=current,dc=bugs,dc=debian,dc=org' '(debbugsPackage=ldap-utils)'

SRC/plugins/list-of-dirs.m4

@@ -0,0 +1,16 @@
+dnl Created automatically on Tue Jul 27 14:46:36 CEST 2004
+if test "$dns_BUILD" = 1; then
+  AC_CONFIG_SUBDIRS(dns)
+fi
+if test "$ldap_BUILD" = 1; then
+  AC_CONFIG_SUBDIRS(ldap)
+fi
+if test "$postgresql_BUILD" = 1; then
+  AC_CONFIG_SUBDIRS(postgresql)
+fi
+if test "$random_BUILD" = 1; then
+  AC_CONFIG_SUBDIRS(random)
+fi
+if test "$whois_BUILD" = 1; then
+  AC_CONFIG_SUBDIRS(whois)
+fi

SRC/plugins/postgresql/Makefile.am

@@ -0,0 +1,10 @@
+if PGSQLBUILD
+pkglib_LTLIBRARIES = postgresql.la
+postgresql_la_SOURCES = postgresql.c
+postgresql_la_LDFLAGS = -module
+endif
+man_MANS = echoping_postgresql.1
+
+EXTRA_DIST = $(man_MANS) 
+
+# $Id$

SRC/plugins/postgresql/configure.ac

@@ -0,0 +1,34 @@
+dnl $Id$
+
+m4_include([../../configure-common.ac])
+AM_INIT_AUTOMAKE(foreign)
+AC_CONFIG_HEADERS(config.h)
+
+m4_include([../configure-plugins.ac])
+
+PGSQL_BUILD=1
+AC_ARG_WITH(pgsql,
+ [  --with-pgsql[=DIR]  PostgreSQL development library],dnl
+ [if test "$withval" != "no"; then
+   if test "$withval" != "yes"; then
+        PGSQLROOT=$withval
+        LDFLAGS="${LDFLAGS} -L$PGSQLROOT/lib"
+        CPPFLAGS="${CPPFLAGS} -I$PGSQLROOT/include"  
+   fi
+  else
+       PGSQL_BUILD=0 
+ fi],
+)
+AC_CHECK_FUNCS(poptGetContext,, 
+   [AC_CHECK_LIB(popt,poptGetContext,,[AC_MSG_WARN([No popt development environment found, not building this plugin]) && PGSQL_BUILD=0])])
+if test "$PGSQL_BUILD" != "0"; then
+AC_CHECK_FUNCS(PQconnectdb, , 
+   [AC_CHECK_LIB(pq,PQconnectdb,,
+      [AC_MSG_WARN([No PostgreSQL development environment found, not building this plugin]) && PGSQL_BUILD=0])])
+fi
+AC_CHECK_HEADER([libpq-fe.h],,
+	[AC_CHECK_HEADER([postgresql/libpq-fe.h],AC_DEFINE(POSTGRESQL_PREFIX,1,[Define if you need to include postgresql/libpq-fe.h, not just libpq-fe.h]),
+		[AC_MSG_WARN([No PostgreSQL header found, not building this plugin]) && PGSQL_BUILD=0])])
+AM_CONDITIONAL(PGSQLBUILD, test "$PGSQL_BUILD" = 1)
+AC_OUTPUT(Makefile)
+

SRC/plugins/postgresql/echoping_postgresql.1

@@ -0,0 +1,53 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ECHOPING_POSTGRESQL 1 "May 26, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+echoping_postgresql \- echoping plugin which connects to a PostgreSQL RDBMS server
+.SH SYNOPSIS
+.B echoping
+.RI [echoping\ options]
+.RI -m\ postgresql
+.B hostname
+.RI [-c conninfo]
+.RI [-e]
+.RI [-r]
+.RI [SQL-request]
+.SH DESCRIPTION
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+postgresql is an echoping plugin to connect to PostgreSQL RDBMS servers.
+.SH ARGUMENTS
+.B [SQL-request]
+The request to the PostgreSQL server (in SQL). Only SELECT are
+supported. The default is 'SELECT now()'.
+.TP
+.SH OPTIONS
+.TP
+.B \-c, \-\-conninfo
+Connection information for the Postgresql server. Something like 'dbname=bar'
+.TP
+.B \-r, \-\-readall
+Read all the data sent by the Postgresql server
+.TP
+.B \-e, \-\-connect-each-time
+(Re)connect to the Postgresql server at each iteration
+.SH SEE ALSO
+.BR echoping (1),
+.SH AUTHOR
+Stephane Bortzmeyer <bortz@users.sourceforge.net>

SRC/plugins/postgresql/postgresql.c

@@ -0,0 +1,143 @@
+/*
+ * PostgreSQL plugin. 
+ * $Id$
+ */
+
+#define IN_PLUGIN
+#include "../../echoping.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef POSTGRESQL_PREFIX
+#include <postgresql/libpq-fe.h>
+#else
+#include <libpq-fe.h>
+#endif
+
+const char     *request = NULL;
+int             readall = FALSE;
+int             connect_each_time = FALSE;
+poptContext     postgresql_poptcon;
+PGconn         *conn;
+PGresult       *res;
+char           *conninfo;
+echoping_options global_options;
+
+void
+postgresql_usage(const char *msg)
+{
+    if (msg) {
+        printf("PostgreSQL plugin error: %s\n", msg);
+    }
+    poptPrintUsage(postgresql_poptcon, stdout, 0);
+    fprintf(stderr, "  [SQL-request]\n");
+    exit(1);
+}
+
+char           *
+init(const int argc, const char **argv,
+     const echoping_options global_external_options)
+{
+    int             value;
+    char           *msg = malloc(256);
+    char           *rest;
+    /* popt variables */
+    struct poptOption options[] = {
+        {"conninfo", 'c', POPT_ARG_STRING, &conninfo, 0,
+         "Connection information for the Postgresql server. Something like 'host=foo dbname=bar''",
+         ""},
+        {"readall", 'a', POPT_ARG_NONE, &readall, 0,
+         "Read all the data sent by the Postgresql server",
+         ""},
+        {"connect-each-time", 'e', POPT_ARG_NONE, &connect_each_time, 0,
+         "(Re)Connect to the Postgresql server at each iteration",
+         ""},
+        POPT_AUTOHELP POPT_TABLEEND
+    };
+    global_options = global_external_options;
+    if (global_options.udp)
+        err_quit("UDP makes no sense for a PostgreSQL connection");
+    postgresql_poptcon = poptGetContext(NULL, argc,
+                                        argv, options, POPT_CONTEXT_POSIXMEHARDER);
+    while ((value = poptGetNextOpt(postgresql_poptcon)) > 0) {
+    }
+    if (value < -1) {
+        sprintf(msg, "%s: %s",
+                poptBadOption(postgresql_poptcon, POPT_BADOPTION_NOALIAS),
+                poptStrerror(value));
+        postgresql_usage(msg);
+    }
+    request = poptGetArg(postgresql_poptcon);
+    if (request == NULL)
+        request = "SELECT now()";
+    rest = poptGetArg(postgresql_poptcon);
+    if (rest != NULL)
+        postgresql_usage("Erroneous additional arguments");
+    if (conninfo == NULL)
+        conninfo = "";
+    return NULL;                /* We only use the conninfo, echoping does not see
+                                 * our hostname or port */
+}
+
+void
+start_raw()
+{
+    if (!connect_each_time) {
+        conn = PQconnectdb(conninfo);
+        if (conn == NULL) {
+            err_quit("Cannot create connection\n");
+        }
+        if (PQstatus(conn) == CONNECTION_BAD) {
+            err_quit("Connection failed: %s\n", PQerrorMessage(conn));
+        }
+    }
+}
+
+int
+execute()
+{
+    unsigned int    row, column;
+    char           *result;
+    if (connect_each_time) {
+        conn = PQconnectdb(conninfo);
+        if (conn == NULL) {
+            err_ret("Cannot create connection\n");
+            return -1;
+        }
+        if (PQstatus(conn) == CONNECTION_BAD) {
+            err_ret("Connection failed: %s\n", PQerrorMessage(conn));
+            return -1;
+        }
+    }
+    res = PQexec(conn, request);
+    if (PQresultStatus(res) != PGRES_TUPLES_OK) {
+        err_ret("Cannot run \"%s\": %s\n", request, PQresultErrorMessage(res));
+        return -1;
+    }
+    if (global_options.verbose)
+        printf("%d tuples returned\n", PQntuples(res));
+    if (readall) {
+        for (row = 0; row < PQntuples(res); row++) {
+            for (column = 0; column < PQnfields(res); column++) {
+                result = PQgetvalue(res, row, column);
+                if (result == NULL) {
+                    err_ret("Cannot retrieve value [%d,%d]\n", row, column);
+                    return -1;
+                }
+                /* else { printf ("DEBUG: [%d,%d] %s\n", row, column, result); } */
+            }
+        }
+    }
+    if (connect_each_time)
+        PQfinish(conn);
+    return 0;
+}
+
+void
+terminate()
+{
+    if (!connect_each_time)
+        PQfinish(conn);
+}

SRC/plugins/random/Makefile.am

@@ -0,0 +1,6 @@
+pkglib_LTLIBRARIES = random.la
+random_la_SOURCES = random.c
+random_la_LDFLAGS = -module
+man_MANS = echoping_random.1
+
+EXTRA_DIST = $(man_MANS)

SRC/plugins/random/configure.ac

@@ -0,0 +1,12 @@
+dnl $Id$
+
+m4_include(../../configure-common.ac)
+AM_INIT_AUTOMAKE(foreign)
+AC_CONFIG_HEADERS(config.h)
+
+RANDOM_BUILD=1
+
+AC_CHECK_FUNCS(usleep,, [AC_MSG_WARN([No usleep() found, not building this plugin]) && RANDOM_BUILD=0])
+AC_SUBST(RANDOM_BUILD,$RANDOM_BUILD)
+AC_OUTPUT(Makefile)
+

SRC/plugins/random/echoping_random.1

@@ -0,0 +1,36 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ECHOPING_RANDOM 1 "May 26, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+echoping_random \- echoping plugin which just sleeps a random time
+.SH SYNOPSIS
+.B echoping
+.RI [echoping\ options]
+.RI -m\ random
+.B hostname
+.SH DESCRIPTION
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+random is a dummy echoping plugin, made only for demo purposes.
+.SH OPTIONS
+No options
+.SH SEE ALSO
+.BR echoping (1),
+.SH AUTHOR
+Stephane Bortzmeyer <bortz@users.sourceforge.net>

SRC/plugins/random/random.c

@@ -0,0 +1,37 @@
+/*
+ * Pseudo-random plugin. Just an example. 
+ * 
+ * $Id$
+ */
+
+#include <stdlib.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+
+char           *
+init(const int argc, const char *argv[])
+{
+    struct timeval  tv;
+    (void) gettimeofday(&tv, (struct timezone *) NULL);
+    srand(tv.tv_usec);
+    return "7";                 /* Not used, just to say we use the cooked interface 
+                                 */
+}
+
+void
+start()
+{
+}
+
+int
+execute()
+{
+    usleep(rand() % 1000000);
+    return 1;
+}
+
+void
+terminate()
+{
+}

SRC/plugins/whois/Makefile.am

@@ -0,0 +1,8 @@
+CONFIGURE_DEPENDENCIES=../../configure-common.ac ../configure-plugins.ac
+
+pkglib_LTLIBRARIES = whois.la
+whois_la_SOURCES = whois.c
+whois_la_LDFLAGS = -module
+man_MANS = echoping_whois.1
+
+EXTRA_DIST = $(man_MANS) test.sh

SRC/plugins/whois/configure.ac

@@ -0,0 +1,14 @@
+dnl $Id$
+
+m4_include([../../configure-common.ac])
+AM_INIT_AUTOMAKE(foreign)
+AC_CONFIG_HEADERS(config.h)
+
+m4_include([../configure-plugins.ac])
+
+WHOIS_BUILD=1
+AC_CHECK_FUNCS(poptGetContext,, 
+   [AC_CHECK_LIB(popt,poptGetContext,,[AC_MSG_WARN([No popt development environment found, not building this plugin]) && WHOIS_BUILD=0])])
+AC_SUBST(WHOIS_BUILD,$WHOIS_BUILD)
+AC_OUTPUT(Makefile)
+

SRC/plugins/whois/echoping_whois.1

@@ -0,0 +1,45 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ECHOPING_WHOIS 1 "May 26, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+echoping_whois \- echoping plugin which connects to a whois server
+.SH SYNOPSIS
+.B echoping
+.RI [echoping\ options]
+.RI -m\ whois
+.B hostname
+.RI [-d]
+.RI request
+.SH DESCRIPTION
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+whois is an echoping plugin to connect to whois/nicname servers (see
+RFC 3912).
+.SH ARGUMENTS
+.TP
+.B request
+The request to the whois server (typically a domain name)
+.SH OPTIONS
+.TP
+.B \-d, \-\-dump
+Dumps the result of the request
+.SH SEE ALSO
+.BR echoping (1),
+.SH AUTHOR
+Stephane Bortzmeyer <bortz@users.sourceforge.net>

SRC/plugins/whois/test.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# $Id$
+
+../../echoping -m whois -v whois.nic.fr --dump echoping.fr # Does not exist
+../../echoping -m whois -v whois.nic.fr --dump nic.fr # Exists

SRC/plugins/whois/whois.c

@@ -0,0 +1,132 @@
+/*
+ * Whois (RFC 3912) plugin. 
+ *
+ * $Id$
+ */
+
+#define IN_PLUGIN
+#include "../../echoping.h"
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#include "config.h"
+#endif
+
+#define MAX_REQUEST 256
+
+struct addrinfo whois_server;
+char           *hostname;
+const char     *request = NULL;
+int             dump = FALSE;
+int             n;
+int             sockfd;
+FILE           *files = NULL;
+poptContext     whois_poptcon;
+echoping_options general_options;
+
+void
+whois_usage(const char *msg)
+{
+    if (msg) {
+        printf("Error: %s\n", msg);
+    }
+    poptPrintUsage(whois_poptcon, stdout, 0);
+    fprintf(stderr, "  request\n");
+    exit(1);
+}
+
+char           *
+init(const int argc, const char **argv, echoping_options global_options)
+{
+    int             value;
+    char           *msg = malloc(256);
+    char           *rest;
+    /* popt variables */
+    struct poptOption options[] = {
+        {"dump", 'd', POPT_ARG_NONE, &dump, 'd',
+         "Dumps the reply from the whois server",
+         ""},
+        POPT_AUTOHELP POPT_TABLEEND
+    };
+    general_options = global_options;
+    if (global_options.udp)
+        err_quit("UDP is incompatible with this whois plugin");
+    /* Will probably be catched before because /etc/services have no entry for UDP
+     * port 43 */
+    whois_poptcon = poptGetContext(NULL, argc,
+                                   argv, options, POPT_CONTEXT_POSIXMEHARDER);
+    while ((value = poptGetNextOpt(whois_poptcon)) > 0) {
+        switch ((char) value) {
+        case 'd':
+            break;
+        default:
+            sprintf(msg, "Wrong option %d (%c)", value, (char) value);
+            whois_usage(msg);
+        }
+    }
+    if (value < -1) {
+        sprintf(msg, "%s: %s",
+                poptBadOption(whois_poptcon, POPT_BADOPTION_NOALIAS),
+                poptStrerror(value));
+        whois_usage(msg);
+    }
+    request = (char *) poptGetArg(whois_poptcon);
+    if (request == NULL)
+        whois_usage("Mandatory request missing");
+    rest = (char *) poptGetArg(whois_poptcon);
+    if (rest != NULL && strcmp(rest, ""))
+        whois_usage("Extraneous arguments ignored");
+    return "nicname";
+}
+
+void
+start(struct addrinfo *res)
+{
+    whois_server = *res;
+}
+
+int
+execute()
+{
+    int             nr = 0;
+    char            recvline[MAX_LINE + 1];
+    char            complete_request[MAX_REQUEST];
+#ifdef HAVE_TCP_INFO
+    struct tcp_info tcpinfo;
+    socklen_t       socket_length = sizeof(tcpinfo);
+#endif
+    if ((sockfd =
+         socket(whois_server.ai_family, whois_server.ai_socktype,
+                whois_server.ai_protocol)) < 0)
+        err_sys("Can't open socket");
+    if (connect(sockfd, whois_server.ai_addr, whois_server.ai_addrlen) < 0)
+        err_sys("Can't connect to server");
+    if ((files = fdopen(sockfd, "r")) == NULL)
+        err_sys("Cannot fdopen");
+    sprintf(complete_request, "%s\r\n", request);
+    n = strlen(complete_request);
+    if (writen(sockfd, complete_request, n) != n)
+        err_sys("writen error on socket");
+    /* Read from the server */
+    while ((nr = readline(files, recvline, MAX_LINE, 0)) > 0)
+        if (dump)
+            printf("%s", recvline);
+    if (dump)
+        printf("\n");
+#ifdef HAVE_TCP_INFO
+    /* Thanks to Perry Lorier <perry@coders.net> for the tip */
+    if (general_options.verbose) {
+        if (getsockopt(sockfd, SOL_TCP, TCP_INFO, &tcpinfo, &socket_length)
+            != -1) {
+            printf("Estimated TCP RTT: %.04f seconds\n",
+                   tcpinfo.tcpi_rtt / 1000000.0);
+        }
+    }
+#endif
+    close(sockfd);
+    return 1;
+}
+
+void
+terminate()
+{
+}

SRC/readline.c

@@ -8,131 +8,183 @@
 #include "echoping.h"
 
 int
-readline (fs, ptr, maxlen, ln)
-     FILE *fs;
-     char *ptr;
-     int maxlen;
-     unsigned short ln;
+readline(fs, ptr, maxlen, ln)
+    FILE           *fs;
+    char           *ptr;
+    int             maxlen;
+    unsigned short  ln;
 {
-  int n = 1;
-  char *rc;
-  int r;
+    int             n = 1;
+    char           *rc;
+    int             r;
 
-  /* Reading with fgets or fread instead of read
-     one-character-at-a-time is more than ten times faster, on a local
-     server. */
-  if (ln)
-    {
-      rc = fgets (ptr, maxlen + 1, fs);
-      if (rc == NULL)
-	{
-	  return (-1);
-	}
-      n = strlen (rc);
-      return n;
+    /* Reading with fgets or fread instead of read one-character-at-a-time is more
+     * than ten times faster, on a local server. */
+    if (ln) {
+        rc = fgets(ptr, maxlen + 1, fs);
+        if (rc == NULL) {
+            if (timeout_flag)
+                return n;
+            return (-1);
+        }
+        n = strlen(rc);
+        return n;
+    } else {
+        while (n < maxlen) {
+            r = fread(ptr, 1, maxlen, fs);
+            if (timeout_flag)
+                return r;
+            if (r == 0) {
+                if (n == 1)
+                    return (0); /* EOF, no data read */
+                else
+                    break;      /* EOF, some data was read */
+            }
+            n = n + r;
+        }
     }
-  else
-    {
-      while (n < maxlen)
-	{
-	  r = fread (ptr, 1, maxlen, fs);
-	  if (r == 0)
-	    {
-	      if (timeout_flag)
-		return n;
-	      if (n == 1)
-		return (0);	/* EOF, no data read */
-	      else
-		break;		/* EOF, some data was read */
-	    }
-	  n = n + r;
-	}
-    }
-  return (n);
+    return (n);
 }
 
 #ifdef OPENSSL
 
-char SSL_buffer[MAXTOREAD];
-int buf_ptr;
-int buf_end;
+char            SSL_buffer[MAXTOREAD];
+int             buf_ptr;
+int             buf_end;
 
 int
-SSL_readline (sslh, ptr, maxlen, ln)
-     SSL *sslh;
-     char *ptr;
-     int maxlen;
-     unsigned short ln;
+SSL_readline(sslh, ptr, maxlen, ln)
+    SSL            *sslh;
+    char           *ptr;
+    int             maxlen;
+    unsigned short  ln;
 {
-  int rc = 0;
-  int n = 0;
-  int i, oi;
-  if (ln)
-    {
-      /* Empty buffer */
-      if (buf_end == 0)
-	{
-	  rc = SSL_read (sslh, SSL_buffer, maxlen);
-	  if (rc == -1) 
-	    return rc;
-	  buf_end = rc;
-	  buf_ptr = 0;
-	}
-      /* No more data in the buffer */
-      else if (buf_ptr == buf_end)
-	{
-	  buf_ptr = 0;
-	  rc = SSL_read (sslh, SSL_buffer, maxlen);
-	  if (rc == -1) 
-	    return rc;
-	  buf_end = rc;
-	}
-      else if (SSL_buffer[buf_end] != '\n') {
-      /* We have a probleme here is the first SSL_read sent back
-         a text not finished by a \n. See www.SSL.de for an
-         example. We get more data. See bug #230384 */
-	  rc = SSL_read (sslh, SSL_buffer+buf_end, maxlen);
-	  if (rc == -1) 
-	    return rc;
-	  buf_end = buf_end + rc;
-      }
-      for (oi = buf_ptr, i = buf_ptr; 
-	   i <= buf_end && SSL_buffer[i] != '\n'; 
-	   i++)
-	{
-	  *ptr++ = SSL_buffer[i];
-	  buf_ptr++;
-	}
-      if (SSL_buffer[i] == '\n')
-	buf_ptr++;
-      *ptr = '\0';
-      /* if (ln)
-	 printf ("SSL_redaline returns %d (%s)\n", i - oi, SSL_buffer); */
-      return (i - oi);
+    int             rc = 0;
+    int             n = 0;
+    int             i, oi;
+    if (ln) {
+        /* Empty buffer */
+        if (buf_end == 0) {
+            rc = SSL_read(sslh, SSL_buffer, maxlen);
+            if (rc == -1)
+                return rc;
+            buf_end = rc;
+            buf_ptr = 0;
+        }
+        /* No more data in the buffer */
+        else if (buf_ptr == buf_end) {
+            buf_ptr = 0;
+            rc = SSL_read(sslh, SSL_buffer, maxlen);
+            if (rc == -1)
+                return rc;
+            buf_end = rc;
+        } else if (SSL_buffer[buf_end] != '\n') {
+            /* We have a probleme here is the first SSL_read sent back a text not
+             * finished by a \n. See www.SSL.de for an example. We get more data.
+             * See bug #230384 */
+            rc = SSL_read(sslh, SSL_buffer + buf_end, maxlen);
+            if (rc == -1)
+                return rc;
+            buf_end = buf_end + rc;
+        }
+        for (oi = buf_ptr, i = buf_ptr; i <= buf_end && SSL_buffer[i] != '\n'; i++) {
+            *ptr++ = SSL_buffer[i];
+            buf_ptr++;
+        }
+        if (SSL_buffer[i] == '\n')
+            buf_ptr++;
+        *ptr = '\0';
+        /* if (ln) printf ("SSL_readline returns %d (%s)\n", i - oi, SSL_buffer); */
+        return (i - oi);
+    } else {
+        /* OpenSSL reads at most 4096 characters */
+        rc = 1;                 /* Just to avoid exiting too soon */
+        while (n < maxlen && rc != 0) {
+            if ((buf_end == 0) || (buf_ptr > buf_end)) {
+                rc = SSL_read(sslh, ptr, maxlen);
+                buf_end = 0;
+                buf_ptr = 0;
+            } else {
+                for (i = buf_ptr; i < maxlen && i <= buf_end; i++) {
+                    *ptr++ = SSL_buffer[i];
+                    rc++;
+                }
+                buf_ptr = i;
+            }
+            n = n + rc;
+        }
+        return n;
     }
-  else
-    {
-      /* OpenSSL reads at most 4096 characters */
-      rc = 1; /* Just to avoid exiting too soon */
-      while (n < maxlen && rc != 0) {
-	if ((buf_end == 0) || (buf_ptr > buf_end))
-	  {
-	    rc = SSL_read (sslh, ptr, maxlen);
-	    buf_end = 0;
-	    buf_ptr = 0;
-	  }
-	else
-	  {
-	    for (i = buf_ptr; i < maxlen && i <= buf_end; i++)
-	      {
-		*ptr++ = SSL_buffer[i];
-		rc++;
-	      }
-	    buf_ptr = i;
-	  }
-	n = n + rc;
-      }
-      return n;
+}
+#endif
+
+#ifdef GNUTLS
+
+char            TLS_buffer[MAXTOREAD];
+int             buf_ptr;
+int             buf_end;
+
+int
+TLS_readline(session, ptr, maxlen, ln)
+    gnutls_session  session;
+    char           *ptr;
+    int             maxlen;
+    unsigned short  ln;
+{
+    int             rc = 0;
+    int             n = 0;
+    int             i, oi;
+    if (ln) {
+        /* Empty buffer */
+        if (buf_end == 0) {
+            rc = gnutls_record_recv(session, TLS_buffer, maxlen);
+            if (rc == -1)
+                return rc;
+            buf_end = rc;
+            buf_ptr = 0;
+        }
+        /* No more data in the buffer */
+        else if (buf_ptr == buf_end) {
+            buf_ptr = 0;
+            rc = gnutls_record_recv(session, TLS_buffer, maxlen);
+            if (rc == -1)
+                return rc;
+            buf_end = rc;
+        } else if (TLS_buffer[buf_end] != '\n') {
+            rc = gnutls_record_recv(session, TLS_buffer + buf_end, maxlen);
+            if (rc == -1)
+                return rc;
+            buf_end = buf_end + rc;
+        }
+        for (oi = buf_ptr, i = buf_ptr; i <= buf_end && TLS_buffer[i] != '\n'; i++) {
+            *ptr++ = TLS_buffer[i];
+            buf_ptr++;
+        }
+        if (TLS_buffer[i] == '\n')
+            buf_ptr++;
+        *ptr = '\0';
+        /* printf ("DEBUG: TLS_readline returns %d (%s)\n", i - oi, TLS_buffer); */
+        return (i - oi);
+    } else {
+        rc = 1;                 /* Just to avoid exiting too soon */
+        while (n < maxlen && rc > 0) {
+            if ((buf_end == 0) || (buf_ptr > buf_end)) {
+                rc = gnutls_record_recv(session, ptr, maxlen);
+                buf_end = 0;
+                buf_ptr = 0;
+            } else {
+                for (i = buf_ptr; i < maxlen && i <= buf_end; i++) {
+                    *ptr++ = TLS_buffer[i];
+                    rc++;
+                    /* printf ("DEBUG: Now %d chars read\n", rc); */
+                }
+                buf_ptr = i;
+            }
+            if (rc > 0)
+                n = n + rc;
+            /* printf ("DEBUG: Now %d chars to send\n", n); */
+        }
+        return n;
     }
 }
 #endif

SRC/recreate-autofiles

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# For developers only: use it only if you know about autotools. 
+
+set -e
+
+# Does *not* work with automake 1.4!
+aclocal
+autoheader
+libtoolize --force
+automake --add-missing 
+autoconf
+cd plugins
+aclocal
+automake --foreign --add-missing
+autoconf
+for dir in dns random whois ldap postgresql; do
+   cd $dir
+   aclocal
+   autoheader
+   automake --foreign --add-missing
+   autoconf
+   cd ..
+done
+cd ..

SRC/smtp.c

@@ -8,31 +8,27 @@
 
 #ifdef SMTP
 
-char big_recvline[MAXTOREAD];
+char            big_recvline[MAXTOREAD];
 
 int
-smtp_read_response_from_server (FILE *fs)
+smtp_read_response_from_server(FILE * fs)
 {
-  int nr;
-  int i;
+    int             nr;
+    int             i;
 
-  for (i = 0; i < MAXSMTPLINES; i++)
-    {
-      nr = readline (fs, big_recvline, MAXTOREAD, TRUE);
-      if (nr <= 4)
-	{
-	  return -1;
-	}
-      if (big_recvline[3] == ' ')
-	{
-	  return nr;
-	}
-      if (big_recvline[3] != '-')
-	{
-	  return -1;
-	}
+    for (i = 0; i < MAXSMTPLINES; i++) {
+        nr = readline(fs, big_recvline, MAXTOREAD, TRUE);
+        if (nr <= 4) {
+            return -1;
+        }
+        if (big_recvline[3] == ' ') {
+            return nr;
+        }
+        if (big_recvline[3] != '-') {
+            return -1;
+        }
     }
-  return -1;
+    return -1;
 }
 
-#endif /* SMTP */
+#endif                          /* SMTP */

SRC/test-echoping-crypto

@@ -11,11 +11,8 @@ echo " echoping's fault: it may be a network problem."
 echo ""
 
 # We need to iterate to catch some SSL programming errors. See bug #130151 
-./echoping -C -h / -n 2 www.modssl.org
-
-echo ""
-
-./echoping -C -h / -n 2 www.creditmutuel.fr
+#./echoping -C -h / -n 2 www.modssl.org
+./echoping -C -h / -n 2 www.verisign.com
 
 echo ""
 

SRC/test-echoping-idn

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# $Id$
+
+echo ""
+echo "Since this tests tries remote servers, a failure is not always "
+echo " echoping's fault: it may be a network problem."
+echo ""
+echo "For this specific test, you *must* set the locale to UTF-8. It is system-"
+echo "dependent but you typically 'export LC_CTYPE=xx_XX.utf8' or "
+echo "'export CHARSET=utf8', depending on your system. 'locale -a' to get"
+echo "possible values."
+
+./echoping -h / -v café.gennic.net
+./echoping -h / -v www.trườngđạihọcbáchkhoahànội.edu.vn
+./echoping -h / -v www.müller.ch

SRC/test-echoping-ipv6

@@ -6,8 +6,13 @@ echo ""
 echo "Since this tests tries remote servers, a failure is not always "
 echo " echoping's fault: it may be a network problem."
 
-./echoping -h / -v www.6bone.net
+./echoping -6 -h / -v www.ripe.net
 
-./echoping -h / -v ns3.nic.fr
+./echoping -6 -h / -v www.afnic.fr
 
+./echoping -6 -v -R -h / "[2001:4f8:0:2::d]:80" # RFC 3986, section 3.2.2
+
+# We force the use of IPv6 with -6 because some libc (Solaris) are
+# smart enough to send only the IPv4 adresses to the application if
+# the machine has no IPv6 connectivity.
 

SRC/test-echoping-local

@@ -7,11 +7,12 @@ echo "A message such as 'connection refused' is not always an error"
 echo " you may not have an appropriate server."
 echo " UDP tests can also fail with a timeout if you do not have the server."
 
-# Funny Solaris: "localhost" resolves to an IPv6 address (::1)
-
-./echoping localhost
-./echoping -u localhost
-./echoping -d localhost
-./echoping -d -u localhost
-#./echoping -c localhost # chargen is too often unavailable
-./echoping -h / localhost
+# Some operating systems, like Solaris or Tru64, uses a file "ipnodes",
+# somewhere under /etc, in which "localhost" resolves to an IPv6
+# address (::1), even if the machine has no IPv6 at all. Hence the -4.
+./echoping -4 localhost
+./echoping -4 -u localhost
+./echoping -4 -d localhost
+./echoping -4 -d -u localhost
+#./echoping -4 -c localhost # chargen is too often unavailable
+./echoping -4 -h / localhost

SRC/test-echoping-plugins

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# $Id$
+
+echo ""
+echo "Since this tests tries remote servers, a failure is not always "
+echo " echoping's fault: it may be a network problem."
+echo ""
+
+for plugin in `ls plugins`; do
+	if [ -d plugins/$plugin ]; then
+	    cd plugins/$plugin
+	    if [ -x ./test.sh ]; then
+		echo "Testing $plugin..."
+		sh ./test.sh
+		echo ""
+	    fi
+	    cd ../..
+	fi
+done

SRC/test-echoping-proxy

@@ -13,11 +13,11 @@ fi
 
 ./echoping -h http://www.netaktiv.com/ cache:$PROXY_PORT
 
-./echoping -h http://www.freenix.org/ cache:$PROXY_PORT
+./echoping -h http://www.debian.org/ cache:$PROXY_PORT
 
-./echoping -a -h http://www.freenix.org/ cache:$PROXY_PORT
+./echoping -a -h http://www.debian.org/ cache:$PROXY_PORT
 
-./echoping -A -h http://www.freenix.org/ cache:$PROXY_PORT
+./echoping -A -h http://www.debian.org/ cache:$PROXY_PORT
 
 
 

SRC/test-echoping-remote

@@ -6,10 +6,11 @@ echo ""
 echo "Since this tests tries remote servers, a failure is not always "
 echo " echoping's fault: it may be a network problem."
 
-./echoping central.internatif.org
+# There are no more public echo servers :-(
+#./echoping echo.example.org
 
 ./echoping -h / www.debian.org
 
-./echoping -h / www.freenix.org
+./echoping -h / www.afnic.fr
 
 ./echoping -S mx3.hotmail.com

SRC/test-echoping-tos

@@ -7,10 +7,11 @@ echo "Since this tests tries remote servers, a failure is not always "
 echo " echoping's fault: it may be a network problem."
 echo "On some systems, you may NEED to be root."
 
-./echoping -P 0xa0 central.internatif.org
+# Raise the precedence to "critic" (RFC 791, section 3.1)
+./echoping -P 0xa0 -h / www.gullitv.fr
 
 # IPTOS_THROUGHPUT  
-./echoping -P 0x08 central.internatif.org
+./echoping -P 0x08 -h / www.gullitv.fr
 
 
 

SRC/util.c

@@ -7,189 +7,255 @@
 #define STATES 32
 
 #include <time.h>
+#include <ctype.h>
 
-char *
-random_string (unsigned length)
+char           *
+random_string(unsigned length)
 {
 
-  char *state = (char *) malloc (sizeof (char) * STATES);
-  char *result = (char *) malloc (length);
-  int i, number;
-  unsigned seed = (unsigned) time ((time_t *) NULL);
+    char           *state = (char *) malloc(sizeof(char) * STATES);
+    char           *result = (char *) malloc(length + 1);
+    int             i, number;
+    unsigned        seed = (unsigned) time((time_t *) NULL);
 
-  /* printf ("Seed is %u\n", seed); */
+    /* printf ("Seed is %u\n", seed); */
 
-  /* Initialize random generator */
-  (void) initstate (seed, state, STATES);
+    /* Initialize random generator */
+    (void) initstate(seed, state, STATES);
 
-  for (i = 0; i < length; i++)
-    {
-      number = (random () % 94) + 33;
-      /* printf ("Number for %d is %d\n", i, number); */
-      result[i] = (char) number;
+    for (i = 0; i < length; i++) {
+        number = (random() % 94) + 33;
+        /* printf ("Number for %d is %d\n", i, number); */
+        result[i] = (char) number;
     }
-  result[length] = '\0';
+    result[length] = '\0';
 
-  /* printf ("Result is %s\n", result); */
+    /* printf ("Result is %s\n", result); */
 
-  return result;
+    return result;
 
 }
 
+char           *
+to_upper(char *input)
+{
+    int             c;
+    char           *result;
+    result = (char *) malloc(strlen(input));
+    for (c = 0; c < strlen(input); c++)
+        result[c] = toupper((int) input[c]);
+    result[strlen(input)] = '\0';
+    return result;
+}
+
 /*
  * tvsub -- Subtract 2 timeval structs:  out = out - in. Out is assumed to be
  * >= in. Comes from the bing program. 
  */
 void
-tvsub (out, in)
-     struct timeval *out, *in;
+tvsub(out, in)
+    struct timeval *out, *in;
 {
-  if ((out->tv_usec -= in->tv_usec) < 0)
-    {
-      --out->tv_sec;
-      out->tv_usec += 1000000;
+    if ((out->tv_usec -= in->tv_usec) < 0) {
+        --out->tv_sec;
+        out->tv_usec += 1000000;
     }
-  out->tv_sec -= in->tv_sec;
+    out->tv_sec -= in->tv_sec;
 }
 
 /* tvadd -- Adds 2 timeval structs:  out = out + in. */
 void
-tvadd (out, in)
-     struct timeval *out, *in;
+tvadd(out, in)
+    struct timeval *out, *in;
 {
-  if ((out->tv_usec += in->tv_usec) >= 1000000)
-    {
-      ++out->tv_sec;
-      out->tv_usec -= 1000000;
+    if ((out->tv_usec += in->tv_usec) >= 1000000) {
+        ++out->tv_sec;
+        out->tv_usec -= 1000000;
     }
-  out->tv_sec += in->tv_sec;
+    out->tv_sec += in->tv_sec;
 }
 
 /* tvavg -- Averages a timeval struct */
 void
-tvavg (out, number)
-     struct timeval *out;
-     int number;
+tvavg(out, number)
+    struct timeval *out;
+    int             number;
 {
-  double result;
-  /*
-   * out->tv_sec = out->tv_sec/number; out->tv_usec =
-   * out->tv_usec/number; 
-   */
-  result = (1000000 * out->tv_sec + out->tv_usec) / number;
-  /* printf ("Result of average is %f\n", result) */ ;
-  out->tv_sec = (long) (result / 1000000);
-  out->tv_usec = (long) (result - (out->tv_sec * 1000000));
+    double          result;
+    /* 
+     * out->tv_sec = out->tv_sec/number; out->tv_usec =
+     * out->tv_usec/number; 
+     */
+    result = (1000000 * out->tv_sec + out->tv_usec) / number;
+    /* printf ("Result of average is %f\n", result) */ ;
+    out->tv_sec = (long) (result / 1000000);
+    out->tv_usec = (long) (result - (out->tv_sec * 1000000));
 }
 
 /* tvstddev -- Computes the standard deviation of a set of results */
 void
-tvstddev (out, number, average, results)
-     struct timeval *out;
-     int number;
-     struct timeval average;
-     struct result *results;
+tvstddev(out, number, average, results)
+    struct timeval *out;
+    int             number;
+    struct timeval  average;
+    struct result  *results;
+{
+    int             i;
+    struct timeval  result = null_timeval;
+    struct timeval  avg = null_timeval;
+#ifdef DEBUG
+    struct timeval  var = null_timeval;
+#endif
+    struct timeval  large, small;
+    double          d_offset, d_square, d_variance = 0;
+    *out = null_timeval;
+    for (i = 0; i < number; i++) {
+        if (results[i].valid == 1) {
+            result = results[i].timevalue;
+#ifdef DEBUG
+            printf("DEBUG: Value is %f (average is %f)\n", tv2double
+                   (result), tv2double(average));
+#endif
+            avg = average;
+            if (tvcmp(&result, &avg) == -1) {
+                small = result;
+                large = avg;
+            } else {
+                large = result;
+                small = avg;
+            }
+            tvsub(&large, &small);
+#ifdef DEBUG
+            printf("abs offset is %f\n", tv2double(large));
+#endif
+            d_offset = tv2double(large);
+            d_square = d_offset * d_offset;
+            d_variance += d_square;
+#ifdef DEBUG
+            printf("variance is now %f\n", tv2double(var));
+#endif
+        }
+    }
+    result = double2tv(sqrt(d_variance / (double) number));
+    out->tv_sec = result.tv_sec;
+    out->tv_usec = result.tv_usec;
+}
+
+
+ /* tvstddevavg -- Computes the average of values within a set of results where the
+  * sample is within the given number of standard deviations from the average */
+/* TODO: IWBN to return the number of excluded outliers */
+void
+tvstddevavg(out, number, average, results, n_stddev)
+    struct timeval *out;        /* contains std dev on entry */
+    int             number;
+    struct timeval  average;
+    struct result  *results;
+    double          n_stddev;
 {
-  int i;
-  struct timeval result, avg, var = null_timeval;
-  struct timeval square, large, small;
-  *out = null_timeval;
-  for (i = 0; i < number; i++)
-    {
-      if (results[i].valid == 1)
-	{
-	  result = results[i].timevalue;
-	  /* printf ("value is %f (average is %f)\n", 
-	     tv2double (result), tv2double (average)); */
-	  avg = average;
-	  if (tvcmp (&result, &avg) == -1)
-	    {
-	      small = result;
-	      large = avg;
-	    }
-	  else
-	    {
-	      large = result;
-	      small = avg;
-	    }
-	  tvsub (&large, &small);
-	  /* printf ("abs offset is %f\n", tv2double (large)); */
-	  square = double2tv (pow (tv2double (large), 2));
-	  tvadd (&var, &square);
-	  /* printf ("variance is now %f\n", tv2double (var)); */
-	}
+    int             i, valid = 0;
+    struct timeval  result;     /* working value */
+    struct timeval  var = null_timeval; /* result accumulator */
+    double          x;
+    double          maxdev = tv2double(*out) * n_stddev;
+
+    if (tvcmp(out, &null_timeval) == 0) {
+        /* if the SD is 0 then we just return the average */
+        *out = average;
+        return;
     }
-  result = double2tv (sqrt (tv2double (var) / number));
-  out->tv_sec = result.tv_sec;
-  out->tv_usec = result.tv_usec;
+
+    for (i = 0; i < number; i++) {
+        if (results[i].valid == 1) {
+            result = results[i].timevalue;
+            tvsub(&result, &average);
+            /* printf ("value is %f (stddev is %f)\n", tv2double (result), tv2double 
+             * (stddev)); */
+            /* ensure that result (difference to average) is absolute value */
+            if (tvcmp(&result, &null_timeval) == -1) {
+                result = average;
+                tvsub(&result, &results[i].timevalue);
+            }
+            x = tv2double(result);
+            /* printf("value is %g maxdev %g\n",x,maxdev); */
+            if (x <= maxdev) {
+                /* deviation is less than stddev */
+                tvadd(&var, &results[i].timevalue);
+                valid++;
+            } else {
+                /* printf("dropped\n"); */
+            }
+        }
+    }
+    /* printf ("total is %f in %d samples\n", tv2double (var), valid); */
+    if (valid > 0) {
+        *out = double2tv(tv2double(var) / valid);
+    } else {
+        *out = null_timeval;
+    }
+
 }
 
 /* tvcmp -- Compares two timeval structs */
 int
-tvcmp (left, right)
-     struct timeval *left, *right;
+tvcmp(left, right)
+    struct timeval *left, *right;
 {
-  if (left->tv_sec < right->tv_sec)
-    {
-      return -1;
+    if (left->tv_sec < right->tv_sec) {
+        return -1;
     }
-  if (left->tv_sec > right->tv_sec)
-    {
-      return 1;
+    if (left->tv_sec > right->tv_sec) {
+        return 1;
     }
-  if (left->tv_usec < right->tv_usec)
-    {
-      return -1;
+    if (left->tv_usec < right->tv_usec) {
+        return -1;
     }
-  if (left->tv_usec > right->tv_usec)
-    {
-      return 1;
+    if (left->tv_usec > right->tv_usec) {
+        return 1;
     }
-  return 0;
+    return 0;
 
 }
 
 /* tvmin */
 void
-tvmin (champion, challenger)
-     struct timeval *champion, *challenger;
+tvmin(champion, challenger)
+    struct timeval *champion, *challenger;
 {
-  if (tvcmp (champion, challenger) == 1)
-    {
-      champion->tv_sec = challenger->tv_sec;
-      champion->tv_usec = challenger->tv_usec;
+    if (tvcmp(champion, challenger) == 1) {
+        champion->tv_sec = challenger->tv_sec;
+        champion->tv_usec = challenger->tv_usec;
     }
 }
 
 /* tvmax */
 void
-tvmax (champion, challenger)
-     struct timeval *champion, *challenger;
+tvmax(champion, challenger)
+    struct timeval *champion, *challenger;
 {
-  if (tvcmp (champion, challenger) == -1)
-    {
-      champion->tv_sec = challenger->tv_sec;
-      champion->tv_usec = challenger->tv_usec;
+    if (tvcmp(champion, challenger) == -1) {
+        champion->tv_sec = challenger->tv_sec;
+        champion->tv_usec = challenger->tv_usec;
     }
 }
 
 double
-tv2double (tv)
-     struct timeval tv;
+tv2double(tv)
+    struct timeval  tv;
 {
-  double result;
-  result =
-    (((((double) tv.tv_sec) * 1000000.0) + (double) tv.tv_usec) / 1000000.0);
-  /* printf ("Double is %9.3f\n", result); */
-  return result;
+    double          result;
+    result =
+        (((((double) tv.tv_sec) * 1000000.0) + (double) tv.tv_usec) / 1000000.0);
+    /* printf ("Double is %9.3f\n", result); */
+    return result;
 }
 
 struct timeval
-double2tv (x)
-     double x;
+double2tv(x)
+    double          x;
 {
-  struct timeval result;
-  result.tv_sec = (int) (x);
-  result.tv_usec = (int) ((x - result.tv_sec) * 1000000);
-  return result;
+    struct timeval  result;
+    result.tv_sec = (int) (x);
+    result.tv_usec = (int) ((x - result.tv_sec) * 1000000);
+    return result;
 }

SRC/writen.c

@@ -8,26 +8,25 @@
 #include "echoping.h"
 
 int
-writen (fd, ptr, nbytes)
-     register int fd;
-     register char *ptr;
-     register int nbytes;
+writen(fd, ptr, nbytes)
+    register int    fd;
+    register char  *ptr;
+    register int    nbytes;
 {
-  int nleft, nwritten;
+    int             nleft, nwritten;
 
-  nleft = nbytes;
-  while (nleft > 0)
-    {
-      nwritten = write (fd, ptr, nleft);
-      if (nwritten <= 0)
-	return (nwritten);	/* error */
-      /* Some systems, such as Digital's OSF1 (Digital Unix) doesn't set the returned
-         value to -1, even when interrupted by an alarm, whatever says the documentation.
-         errno is not set. */
-      if ((nwritten < nleft) && timeout_flag)
-	return nwritten;
-      nleft -= nwritten;
-      ptr += nwritten;
+    nleft = nbytes;
+    while (nleft > 0) {
+        nwritten = write(fd, ptr, nleft);
+        if (nwritten <= 0)
+            return (nwritten);  /* error */
+        /* Some systems, such as Digital's OSF1 (Digital Unix) doesn't set the
+         * returned value to -1, even when interrupted by an alarm, whatever says
+         * the documentation. errno is not set. */
+        if ((nwritten < nleft) && timeout_flag)
+            return nwritten;
+        nleft -= nwritten;
+        ptr += nwritten;
     }
-  return (nbytes - nleft);
+    return (nbytes - nleft);
 }

Web/Makefile

@@ -1,5 +1,6 @@
 PAGESHTML=$(shell ls *.wml | grep -v template | sed 's/.wml/.html/' )
-DEST=bortz@echoping.sourceforge.net:/home/groups/echoping/htdocs
+OTHERPAGES=$(shell ls *.sh)
+DEST=bortz@echoping.sourceforge.net:/home/groups/e/ec/echoping/htdocs
 URL=http://echoping.sourceforge.net/
 
 all: test
@@ -13,8 +14,8 @@ test: ${PAGESHTML}
 	done
 
 install: ${PAGESHTML}
-	cvs commit
-	scp -v ${PAGESHTML} ${DEST}
+	svn commit
+	scp -v ${PAGESHTML} ${OTHERPAGES} ${DEST}
 
 checkbot:
 	checkbot --url ${URL} --match ${URL} \
@@ -22,3 +23,5 @@ checkbot:
 
 clean:
 	rm -f ${PAGESHTML}
+
+# $Id$

Web/details.wml

@@ -5,12 +5,15 @@
 
 <H2>echo service</H2>
 
-<P>echoping assumes the remote host accepts such connections. Experience show that 
-most Internet routers do and many hosts also. However, some Unices are not 
-shipped with this service enabled and, anyway, the administrator is always 
-free to close it (I think they shouldn't). echoping has therefore less chance 
-to succeed than ping or bing. (On a typical Unix box, "echo" service is 
-configured in /etc/inetd.conf but see the <A HREF="http://www.cert.org/advisories/CA-96.01.UDP_service_denial.html">CERT advisory</A>.)
+<P>echoping, with its default setting, assumes the remote host accepts
+such connections. Experience show that most Internet routers or hosts
+do not. Some Unices are not shipped with this service enabled and,
+anyway, the administrator is always free to close it (I think they
+shouldn't). echoping has therefore less chance to succeed than ping or
+bing. (On a typical Unix box, "echo" service is configured in
+/etc/inetd.conf but see the <A
+HREF="http://www.cert.org/advisories/CA-1996-01.html">CERT
+advisory</A>.)
 
 <H2>What does it measure?</H2>
 
@@ -21,6 +24,12 @@ line raw throughput measures (unlike bing). On the other end, the action it
 performs are close from a HTTP request and it is meaningful to use it 
 (carefully) to measure Web performances. 
 
+<H3>More on Linux</H3>
+
+<P>On operating systems, like Linux, who have the TCP_INFO option (see
+<A HREF="http://linuxgazette.net/136/pfeiffer.html">a detailed
+presentation</A>), echoping can also display interesting TCP information.
+
 <H2>UDP and inetd</H2>
 
 <P>With UDP servers you can have surprises: the first test is quite often
@@ -41,12 +50,18 @@ SunOS need time to recover :-)
 <H3>Unix</H3>
 
 <UL>
-<LI><A HREF="ftp://ftp.lip6.fr/pub/networking">bing</A>, a bandwidth measurement tool
+<LI><A HREF="http://www.internet2.edu/~shalunov/thrulay/">thrulay</A>,
+  measures the capacity of a network by sending a bulk TCP stream over it
+<LI><A
+  HREF="http://www.freenix.fr/freenix/logiciels/bing.html">bing</A>, a
+  bandwidth measurement tool
+<LI>pathchar or <A
+  HREF="http://www.employees.org/~bmah/Software/pchar/">pchar</A>, a bandwidth measurement tool
 <LI>ping, probably available with your system
 <LI>traceroute, idem (otherwise, see <A HREF="ftp://ftp.ee.lbl.gov/">LBL</A>)
 <LI><A HREF="ftp://ftp.arl.mil/pub/ttcp/">ttcp</A>, the best measurement tool but it needs some control over the 
-  two machines (nothing to do with
-  the T/TCP protocol)
+  two machines 
+<LI><A HREF="ftp://ftp.scl.ameslab.gov/pub/netpipe/">Netpipe</A>, it needs some control over the two machines 
 <LI><A HREF="http://www.psc.edu/~pscnoc/treno_info.html">treno</A> (evaluates available bandwidth for TCP) 
 <LI>spray is a tool which I dont't know very well. It is available on some 
   machines (Sun, OSF/1).
@@ -65,7 +80,7 @@ SunOS need time to recover :-)
 <UL>
 <LI>TCP Watcher, a very nice "swiss-army knife" tool, to test ping, DNS, echo. 
   It includes an echo server. Available on <A
-  HREF="http://www.info-mac.org/">Info-Mac</A> in "comm/tcp".
+  HREF="http://www.info-mac.org/">Info-Mac</A> in "comm/inet".
 </UL>
 
 <H3>MS-Windows</H3>
@@ -93,17 +108,27 @@ can be enabled through the Network Control Panel
 
 <H3>Web clients</H3>
 
-You can ping or traceroute on the Web. See 
-  <A
-  HREF="http://www.freenix.org/cgi-bin/traceroute.iphtml">Freenix</A>,
-  <A HREF="http://www.fr.net/internet/trace.html">fr.net</A> (with
-  Autonomous Systems handling) or
-  <A HREF="http://www.tracert.com/">Multiple Traceroute Gateway</A>.
-
+You can ping or traceroute on the Web. See <A
+HREF="http://www.traceroute.org/">traceroute.org</A>.
 
 <P>Use all of them with care, the result is not obvious to interpret.
 
+<P>If you are interested in Internet measurements, there is an <A
+HREF="http://www.ietf.org/">Internet Engineering Task Force</A>
+Working Group, <A
+HREF="http://www.ietf.org/html.charters/ippm-charter.html">IPPM (IP
+Performance Metrics)</A> which produces many fine RFC that are really
+good to read. I appreciate RFC 2330 and 3148.
+
 <P>And don't forget to read RFC 1470 ("Tools for Monitoring and Debugging 
 TCP/IP Internets and Interconnected Devices"), specially its "Benchmark"
 section and the Richard Stevens' books (all of them), published by 
 Addison-Wesley.
+
+<P>Last, but not least, since statistics is typically a very neglected
+area in computer networks, <A
+HREF="http://www.statsoft.com/textbook/stbasic.html">Basic
+Statistics</A> is a fery useful resource. For the reasons why echoping
+displays median as well as average, see <A
+HREF="http://shlang.com/writing/mean-delay-considered-harmful.html">Mean
+Delay Considered Harmful</A>.

Web/donations.wml

@@ -0,0 +1,7 @@
+#use wml::template Title="echoping donations"
+
+<P>If you want to help and/or motivate echoping and its developer, you <em>can</em>
+(but are not forced to do so, echoping is free software):
+
+<P>Give money to a worthy cause :-)
+

Web/echoping-web.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/local/bin
+
+DELAY=`echoping -n 3 -h /tests/bidon www.netaktiv.com | \
+        grep Median | \
+        awk '{print int ($3 * 1000)}' `
+echo $DELAY
+echo $DELAY
+
+UPTIME=`wget -O - -q http://www.netaktiv.com/server-status | \
+    grep uptime | \
+    awk -F: '{print $2}' | sed 's/<br>//' `
+
+echo $UPTIME
+echo Web server
+

Web/index.wml

@@ -3,15 +3,21 @@
 <!-- $Id$ -->
 
 <P>"echoping" is a small program to test (approximatively) performances of a 
-remote host by sending it TCP "echo" (or other protocol) packets.
-
-<P>To install it, see the INSTALL file. Or type "make" if you're in a
-hurry :-) <A
-HREF="ftp://ftp.internatif.org/pub/unix/echoping">Download</A>, if you
-wish. (Or you may prefer access the latest developments <A
-HREF="http://sourceforge.net/cvs/?group_id=4581">via CVS</A>: the
-module is named "SRC".) You may be interested in <A HREF="http://sourceforge.net/project/?group_id=4581">SourceForge's page
-about echoping</A>, with the bug reports, etc.
+remote host by sending it requests such as HTTP requests.
+
+<P>To install it, see the INSTALL file. Or type "<code>./configure
+--config-cache&& make && sudo make install</code>" if you're in a
+hurry :-) Several operating systems have echoping already packaged
+(Debian, Gentoo, FreeBSD, NetBSD). <A
+HREF="http://sourceforge.net/project/showfiles.php?group_id=4581&package_id=4579">Download</A>, if you
+wish. You may be interested also in <A
+HREF="http://sourceforge.net/project/?group_id=4581">SourceForge's
+page about echoping</A>, with the bug reports, etc.
+
+You may prefer access the latest developments <A
+HREF="http://sourceforge.net/svn/?group_id=4581">via Subversion</A>:
+the module is named "SRC"; but <EM>be careful</EM>, this is not for the faint
+of heart and you need to master GNU auto* tools.
 
 <P>To use it, simply:
 
@@ -31,13 +37,17 @@ test hosts which aren't yours.
 <P>Current features:
 
 <UL>
-<LI>uses the protocols echo, discard, chargen or HTTP, 
+<LI>plugins, so you can extend
+echoping with any protocol you like and/or use,
+<LI>Supports IPv6 as well as IPv4,
+<LI>Supports IDN (Unicode domain names like <CODE>café.gennic.net</CODE>),
+<LI>uses the protocols echo, discard, chargen or HTTP,
+<LI>can use cryptographic connections with HTTP,
 <LI>uses UDP instead of TCP for the protocols which accept it (like echo),
 <LI>can repeat the test and display various measures about it,
-<LI>can use T/TCP on systems which support it.
 </UL>
 
-<P><A HREF="http://sourceforge.net/bugs/?func=browse&group_id=4581&set=open">Known bugs</A>
+<P><A HREF="http://sourceforge.net/bugs/?func=browse&amp;group_id=4581&amp;set=open">Known bugs</A>
 
 <P>Examples of output:
 
@@ -46,22 +56,31 @@ test hosts which aren't yours.
 <LI>(Simple test with 1000 bytes echo TCP packets)
 <PRE>
 % echoping -v -s 1000 mycisco
-This is echoping, version 2.0.
-Trying to connect to internet address 10.99.64.1 to transmit 256 bytes...
+
+This is echoping, version 5.0.0.
+
+Trying to connect to internet address 172.21.0.14 7 to transmit 1000 bytes...
 Connected...
+TCP Latency: 0.003165 seconds
 Sent (1000 bytes)...
+Application Latency: 0.322183 seconds
+1000 bytes read from server.
 Checked
-Elapsed time: 0.059597 seconds
+Elapsed time: 0.326960 seconds
 </PRE>
 
-<LI>(Repeated tests with average and median displayed.)
+<LI>(Repeated tests with average / mean and <A
+HREF="http://www.internet2.edu/~shalunov/writing/mean-delay-considered-harmful.html">median</A>
+displayed.)
+  
 <PRE>
-% echoping -n 10 mymachine
+% echoping -n 10 faraway-machine
 [...]
-Minimum time: 0.170719 seconds (1500 bytes per sec.)
-Maximum time: 0.211176 seconds (1212 bytes per sec.)
-Average time: 0.184577 seconds (1387 bytes per sec.)
-Median time: 0.181332 seconds (1412 bytes per sec.)
+Minimum time: 6.722336 seconds (38 bytes per sec.)
+Maximum time: 17.975060 seconds (14 bytes per sec.)
+Average time: 10.873267 seconds (24 bytes per sec.)
+Standard deviation: 3.102793
+Median  time: 9.218506 seconds (28 bytes per sec.)
 </PRE>
 
 <LI>(Testing a Web server with an HTTP request for its home page.)
@@ -72,13 +91,17 @@ Elapsed time: 0.686792 seconds
 
 </OL>
 
-<P>The exit status is set if there is any problem, so you can use echoping
-to test repeatedly a Web server, to be sure it runs fine. Or you can
-display statistics like <A HREF="http://monitor.internatif.org/web.html">at Internatif</A>.
+<P>The exit status is set if there is any problem, so you can use
+echoping to test repeatedly a Web server, to be sure it runs fine (<A
+HREF="http://people.ee.ethz.ch/~oetiker/webtools/smokeping/">SmokePing</A>
+does it). Or you can display statistics with <A
+HREF="http://people.ee.ethz.ch/~oetiker/webtools/mrtg/">MRTG</A>. (see
+an example of a <A HREF="echoping-web.sh">shell script</A> which runs echoping
+from MRTG).
 
-<P>To do for a future version:
+<P>To do for a future version: see the TODO file.
+
+<H3>Helping and motivating the greedy and selfish developer</H3>
+
+You can <A HREF="donations.html">send money, books or postcards</A>.
 
-<UL>
-<LI>display other calculations such as standard deviation
-<LI>fix the bugs (everlasting aim)
-</UL>

tickets-SourceForge/patches.json

@@ -0,0 +1,755 @@
+{"tickets": [{
+  "status": "open-fixed",
+  "reported_by_id": "4f74b61d71b75b397a006f01",
+  "related_artifacts": [],
+  "attachments": [],
+  "reported_by": "zcougar",
+  "assigned_to": "bortz",
+  "labels": [],
+  "discussion_disabled": false,
+  "assigned_to_id": "4f3540db0594ca2bc0000b32",
+  "private": false,
+  "summary": "RPM spec file",
+  "description": "I made RPM spec file for echoping. It would be nice if\r\nyou can put this file into the package. Then it will be\r\nvery easy to make RPM from source \\(rpm -ta\r\nechoping-x.x.x.tar.gz\\).\r\n\r\nBoth SRPM and RPM built on SuSE 9.0 are available also:\r\n\r\nhttp://www.version6.net/rpm/ecmh-20040110-1.src.rpm\r\nhttp://www.version6.net/rpm/ecmh-20040110-1.i586.rpm\r\n\r\n\\-- \r\nCougar\r\n",
+  "discussion_thread": {
+    "_id": "7bc6a80d",
+    "posts": [
+      {
+        "text": "echoping RPM spec file",
+        "attachments": [
+          {
+            "url": "http://sourceforge.net/p/echoping/patches/_discuss/thread/7bc6a80d/fac2/attachment/echoping.spec",
+            "bytes": 1116
+          }
+        ],
+        "author": "zcougar",
+        "timestamp": "2004-06-30 17:52:52",
+        "last_edited": null,
+        "slug": "fac2",
+        "subject": "#1 RPM spec file"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nOK, downloaded the right :-\\) \".src.rpm\" from rhttp://www.version6.net/rpm, \"rpm2cpio echoping.src.rpm | cpio -idv\"\r\n\r\nBut the echoping.spec is not much better than the one already in echoping distribution. I merged the two files, committed in Subversion \\(r. 358\\) testing on a RPM-enabled machine is now needed.\r\n",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 21:37:47",
+        "last_edited": null,
+        "slug": "0956",
+        "subject": "#1 RPM spec file"
+      },
+      {
+        "text": "- **assigned_to**: nobody --> bortz\n- **status**: open --> open-fixed",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 21:37:47",
+        "last_edited": null,
+        "slug": "b62c",
+        "subject": "#1 RPM spec file"
+      }
+    ],
+    "discussion_id": "518aabb45fcbc979b923a2dd",
+    "subject": ""
+  },
+  "mod_date": "2007-03-07 21:37:47",
+  "votes_down": 0,
+  "votes_up": 0,
+  "_id": "518aabb45fcbc979b923a2e8",
+  "discussion_thread_url": "http://sourceforge.net/rest/p/echoping/patches/_discuss/thread/7bc6a80d/",
+  "ticket_num": 1,
+  "custom_fields": {
+    "_priority": "5"
+  },
+  "created_date": "2004-06-30 17:52:51"
+},{
+  "status": "closed-fixed",
+  "reported_by_id": null,
+  "related_artifacts": [],
+  "attachments": [],
+  "reported_by": "*anonymous",
+  "assigned_to": "bortz",
+  "labels": [],
+  "discussion_disabled": false,
+  "assigned_to_id": "4f3540db0594ca2bc0000b32",
+  "private": false,
+  "summary": "add WHOIS support and fix duplicate write to server",
+  "description": "This patch adds whois support to echoping. It also\r\nremoves a\r\nproblem that caused the \"sendline\" to be sent to the\r\nserver twice. This problem causes the SMTP-checker to\r\nsend QUIT twice, which is not so important, but it\r\nactually broke the WHOIS check against some servers.\r\n\r\nTo use WHOIS, do this:\r\nechoping -W example.com hostname\r\n\r\nThe reading/writing seems to be a bit shaky, it fails\r\nwith some servers. I'm not sure why, could be something\r\nis not completely correct in the patch.\r\n\r\nKetil Froyn <ketil@froyn.name>",
+  "discussion_thread": {
+    "_id": "c0518af1",
+    "posts": [
+      {
+        "text": "Patch to add WHOIS support to echoping and remove duplicate write",
+        "attachments": [
+          {
+            "url": "http://sourceforge.net/p/echoping/patches/_discuss/thread/c0518af1/72e0/attachment/echoping_add_whois.diff",
+            "bytes": 6038
+          }
+        ],
+        "author": "nobody",
+        "timestamp": "2004-08-12 16:28:03",
+        "last_edited": null,
+        "slug": "72e0",
+        "subject": "#2 add WHOIS support and fix duplicate write to server"
+      },
+      {
+        "text": "Logged In: NO \n\nThis is the kind of error I get:\r\n\r\nreadline error: 1 bytes read, 13 bytes requested \\(Illegal seek\\)\r\n\r\nI haven't debugged the reason for this, it works for me for now.\r\n\r\nKetil Froyn <ketil@froyn.name>",
+        "attachments": [],
+        "author": "nobody",
+        "timestamp": "2004-08-12 16:30:53",
+        "last_edited": null,
+        "slug": "fbfb",
+        "subject": "#2 add WHOIS support and fix duplicate write to server"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nThanks for the patch and report.\r\n\r\nBut, sorry, but the whois patch will not be used. The next version of echoping will use a system of plugins so every new request for a new protocol will be handled by \"Develop a plugin, Luke\" \\(there is already one for whois\\).\r\n\r\nYou can try the next version at ftp://ftp.internatif.org/pub/unix/echoping/echoping-6.0-BETA.tar.gz\r\n",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 15:37:23",
+        "last_edited": null,
+        "slug": "890f",
+        "subject": "#2 add WHOIS support and fix duplicate write to server"
+      },
+      {
+        "text": "- **assigned_to**: nobody --> bortz\n- **status**: open --> open-wont-fix",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 15:37:23",
+        "last_edited": null,
+        "slug": "1bcc",
+        "subject": "#2 add WHOIS support and fix duplicate write to server"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nI cannot reproduce the \"two QUIT\" problem, sorry.\\(Checked with Wireshark.\\)\r\n",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 15:47:19",
+        "last_edited": null,
+        "slug": "24be",
+        "subject": "#2 add WHOIS support and fix duplicate write to server"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nechoping 6 released, with the whois plugin",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-26 20:59:52",
+        "last_edited": null,
+        "slug": "77f4",
+        "subject": "#2 add WHOIS support and fix duplicate write to server"
+      },
+      {
+        "text": "- **status**: open-wont-fix --> closed-fixed",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-26 20:59:52",
+        "last_edited": null,
+        "slug": "9214",
+        "subject": "#2 add WHOIS support and fix duplicate write to server"
+      }
+    ],
+    "discussion_id": "518aabb45fcbc979b923a2dd",
+    "subject": ""
+  },
+  "mod_date": "2007-03-26 20:59:52",
+  "votes_down": 0,
+  "votes_up": 0,
+  "_id": "518aabb55fcbc979b923a304",
+  "discussion_thread_url": "http://sourceforge.net/rest/p/echoping/patches/_discuss/thread/c0518af1/",
+  "ticket_num": 2,
+  "custom_fields": {
+    "_priority": "5"
+  },
+  "created_date": "2004-08-12 16:28:03"
+},{
+  "status": "closed-duplicate",
+  "reported_by_id": null,
+  "related_artifacts": [],
+  "attachments": [],
+  "reported_by": "*anonymous",
+  "assigned_to": "bortz",
+  "labels": [],
+  "discussion_disabled": false,
+  "assigned_to_id": "4f3540db0594ca2bc0000b32",
+  "private": false,
+  "summary": "improved:add WHOIS support and fix duplicate write to server",
+  "description": "Usage:\r\nechoping -W example.com whois.crsnic.net\r\n\r\nTested like this:\r\npatch -p1 < echoping\\_add\\_whois.diff\r\naclocal && automake --add-missing && autoconf &&\r\n./configure --without-libidn\r\nmake\r\n./echoping -W example.com whois.crsnic.net\r\n\r\nI haven't experienced any more problems after this rewrite.\r\n\r\nKetil Froyn <ketil@froyn.name>\r\n\r\n",
+  "discussion_thread": {
+    "_id": "2bdac84c",
+    "posts": [
+      {
+        "text": "WHOIS support for echoping",
+        "attachments": [
+          {
+            "url": "http://sourceforge.net/p/echoping/patches/_discuss/thread/2bdac84c/f246/attachment/echoping_add_whois.diff",
+            "bytes": 8605
+          }
+        ],
+        "author": "nobody",
+        "timestamp": "2004-08-13 11:44:10",
+        "last_edited": null,
+        "slug": "f246",
+        "subject": "#3 improved:add WHOIS support and fix duplicate write to server"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nSee the discussion in \\#1008066",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 15:40:52",
+        "last_edited": null,
+        "slug": "074b",
+        "subject": "#3 improved:add WHOIS support and fix duplicate write to server"
+      },
+      {
+        "text": "- **assigned_to**: nobody --> bortz\n- **status**: open --> open-duplicate",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 15:40:52",
+        "last_edited": null,
+        "slug": "29e7",
+        "subject": "#3 improved:add WHOIS support and fix duplicate write to server"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nechoping 6 released and should be OK.",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-26 21:01:16",
+        "last_edited": null,
+        "slug": "3b87",
+        "subject": "#3 improved:add WHOIS support and fix duplicate write to server"
+      },
+      {
+        "text": "- **status**: open-duplicate --> closed-duplicate",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-26 21:01:16",
+        "last_edited": null,
+        "slug": "5bb8",
+        "subject": "#3 improved:add WHOIS support and fix duplicate write to server"
+      }
+    ],
+    "discussion_id": "518aabb45fcbc979b923a2dd",
+    "subject": ""
+  },
+  "mod_date": "2007-03-26 21:01:16",
+  "votes_down": 0,
+  "votes_up": 0,
+  "_id": "518aabb85fcbc979b923a333",
+  "discussion_thread_url": "http://sourceforge.net/rest/p/echoping/patches/_discuss/thread/2bdac84c/",
+  "ticket_num": 3,
+  "custom_fields": {
+    "_priority": "5"
+  },
+  "created_date": "2004-08-13 11:44:10"
+},{
+  "status": "closed-out-of-date",
+  "reported_by_id": "51840af32718467ad6898df9",
+  "related_artifacts": [],
+  "attachments": [],
+  "reported_by": "afm",
+  "assigned_to": "bortz",
+  "labels": [],
+  "discussion_disabled": false,
+  "assigned_to_id": "4f3540db0594ca2bc0000b32",
+  "private": false,
+  "summary": "Fix for incorrect Host: header and memory leak",
+  "description": "The attached patch takes care not to include a port in the Host: \r\nheader of the HTTP request if the port is not set \\(i.e. = 0\\) as \r\nargument to make\\_http\\_sendline.\r\n\r\nFurthermore, it fixes the memory leak caused by the fact that \r\nhostname is not freed when HTTP10 is defined.",
+  "discussion_thread": {
+    "_id": "c9820fce",
+    "posts": [
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nIt seems there is no patch attached \\(same problem for \\#1282749\\)\r\n",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 15:48:52",
+        "last_edited": null,
+        "slug": "0000",
+        "subject": "#4 Fix for incorrect Host: header and memory leak"
+      },
+      {
+        "text": "- **assigned_to**: nobody --> bortz",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 15:48:52",
+        "last_edited": null,
+        "slug": "0d1d",
+        "subject": "#4 Fix for incorrect Host: header and memory leak"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nSeems OK with the release of echoping 6. Feel free to reopen if not OK.\r\n",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-26 21:03:09",
+        "last_edited": null,
+        "slug": "e6e3",
+        "subject": "#4 Fix for incorrect Host: header and memory leak"
+      },
+      {
+        "text": "- **status**: open --> closed-out-of-date",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-26 21:03:09",
+        "last_edited": null,
+        "slug": "b2fc",
+        "subject": "#4 Fix for incorrect Host: header and memory leak"
+      }
+    ],
+    "discussion_id": "518aabb45fcbc979b923a2dd",
+    "subject": ""
+  },
+  "mod_date": "2007-03-26 21:03:09",
+  "votes_down": 0,
+  "votes_up": 0,
+  "_id": "518aabba5fcbc979b923a358",
+  "discussion_thread_url": "http://sourceforge.net/rest/p/echoping/patches/_discuss/thread/c9820fce/",
+  "ticket_num": 4,
+  "custom_fields": {
+    "_priority": "5"
+  },
+  "created_date": "2005-09-06 08:46:48"
+},{
+  "status": "closed-duplicate",
+  "reported_by_id": "51840af32718467ad6898df9",
+  "related_artifacts": [],
+  "attachments": [],
+  "reported_by": "afm",
+  "assigned_to": "bortz",
+  "labels": [],
+  "discussion_disabled": false,
+  "assigned_to_id": "4f3540db0594ca2bc0000b32",
+  "private": false,
+  "summary": "Fix for incorrect Host: header and memory leak",
+  "description": "The attached patch takes care not to include a port in the Host: \r\nheader of the HTTP request if the port is not set \\(i.e. = 0\\) as \r\nargument to make\\_http\\_sendline.\r\n\r\nFurthermore, it fixes the memory leak caused by the fact that \r\nhostname is not freed when HTTP10 is defined.",
+  "discussion_thread": {
+    "_id": "224c2394",
+    "posts": [
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nSee \\#1282748",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 15:49:22",
+        "last_edited": null,
+        "slug": "ab70",
+        "subject": "#5 Fix for incorrect Host: header and memory leak"
+      },
+      {
+        "text": "- **assigned_to**: nobody --> bortz\n- **status**: open --> open-duplicate",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 15:49:22",
+        "last_edited": null,
+        "slug": "6af3",
+        "subject": "#5 Fix for incorrect Host: header and memory leak"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nShould be obsolete with the release of 6.0.0",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-26 21:04:56",
+        "last_edited": null,
+        "slug": "42f8",
+        "subject": "#5 Fix for incorrect Host: header and memory leak"
+      },
+      {
+        "text": "- **status**: open-duplicate --> closed-duplicate",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-26 21:04:56",
+        "last_edited": null,
+        "slug": "f1c6",
+        "subject": "#5 Fix for incorrect Host: header and memory leak"
+      }
+    ],
+    "discussion_id": "518aabb45fcbc979b923a2dd",
+    "subject": ""
+  },
+  "mod_date": "2007-03-26 21:04:56",
+  "votes_down": 0,
+  "votes_up": 0,
+  "_id": "518aabbb5fcbc979b923a373",
+  "discussion_thread_url": "http://sourceforge.net/rest/p/echoping/patches/_discuss/thread/224c2394/",
+  "ticket_num": 5,
+  "custom_fields": {
+    "_priority": "5"
+  },
+  "created_date": "2005-09-06 08:46:49"
+},{
+  "status": "closed-fixed",
+  "reported_by_id": "4f3540db0594ca2bc0000b32",
+  "related_artifacts": [],
+  "attachments": [],
+  "reported_by": "bortz",
+  "assigned_to": "bortz",
+  "labels": [],
+  "discussion_disabled": false,
+  "assigned_to_id": "4f3540db0594ca2bc0000b32",
+  "private": false,
+  "summary": "Stats enhancement from Andy Juniper",
+  "description": "\r\nAttached is a patch which addresses the following\r\nissues/enhancements in\r\nechoping-6.0-BETA:\r\n\r\n\\* add a -D command line option to measure latency\r\nover data transfer\r\ntime only, for TCP connections this excludes the\r\nconnection setup \r\nand teardown which can take a long time if DNS and\r\nARP are involved\r\n\\* fix underflow in the standard deviation\r\ncalculation routine, where\r\nif the deviations were small \\(microseconds\\) then\r\nthe standard\r\ndeviation would report as 0 due to performing the\r\nsquare/square\r\nroot operations on integers; the whole of the SD\r\ncalculation is\r\nnow performed using doubles.\r\n\\* add a -N <number> command line option to\r\noptionally additionally\r\nreport a recalculated average which excludes\r\nvalues which are   \r\nfurther than +/- N\\*standard deviation from the\r\naverage; this means\r\nthat values which are a long way off the average\r\nget removed from \r\nthe recalculated average.  See                   \r\n\r\n\r\nhttp://www.statsoft.com/textbook/stbasic.html\\#Correlationse\r\nfor\r\ndetails of why I've done this.\r\n\r\nPlease feel free to incorporate these changes into your\r\ncode\\!\r\n\r\nAndy Juniper\r\n",
+  "discussion_thread": {
+    "_id": "02ec69da",
+    "posts": [
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: YES\n\nUnfortunately, there is no patch attached :-\\(\r\n",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 15:51:17",
+        "last_edited": null,
+        "slug": "864f",
+        "subject": "#6 Stats enhancement from Andy Juniper"
+      },
+      {
+        "text": "",
+        "attachments": [
+          {
+            "url": "http://sourceforge.net/p/echoping/patches/_discuss/thread/02ec69da/0f8a/attachment/echoping.patch",
+            "bytes": 8673
+          }
+        ],
+        "author": "bortz",
+        "timestamp": "2007-03-07 15:53:26",
+        "last_edited": null,
+        "slug": "0f8a",
+        "subject": "#6 Stats enhancement from Andy Juniper"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: YES\n\nPatch attached, this time\nFile Added: echoping.patch",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 15:53:26",
+        "last_edited": null,
+        "slug": "a50b",
+        "subject": "#6 Stats enhancement from Andy Juniper"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: YES\n\nCommitted in Subversion, r356.",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 21:02:43",
+        "last_edited": null,
+        "slug": "0e90",
+        "subject": "#6 Stats enhancement from Andy Juniper"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: YES\n\nAnd documented and credited.\r\n",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 21:21:37",
+        "last_edited": null,
+        "slug": "e0e4",
+        "subject": "#6 Stats enhancement from Andy Juniper"
+      },
+      {
+        "text": "- **status**: open --> open-fixed",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-07 21:21:37",
+        "last_edited": null,
+        "slug": "59d9",
+        "subject": "#6 Stats enhancement from Andy Juniper"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: YES\n\nShipped with echoping 6",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-26 21:07:42",
+        "last_edited": null,
+        "slug": "9680",
+        "subject": "#6 Stats enhancement from Andy Juniper"
+      },
+      {
+        "text": "- **status**: open-fixed --> closed-fixed",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-26 21:07:42",
+        "last_edited": null,
+        "slug": "ebb2",
+        "subject": "#6 Stats enhancement from Andy Juniper"
+      },
+      {
+        "text": "Wonderful blog\\! Do you have any suggestions for aspiring writers? I'm hoping to start my own website soon but I'm a little lost on everything. Would you advise starting with a free platform like Wordpress or go for a paid option? There are so many choices out there that I'm completely overwhelmed .. Any suggestions? Bless you\\!\r\nnorth face jackets on sale http://rmngnwbxvw.wallinside.com/",
+        "attachments": [],
+        "author": "nobody",
+        "timestamp": "2012-11-11 23:53:33",
+        "last_edited": null,
+        "slug": "a2a1",
+        "subject": "#6 Stats enhancement from Andy Juniper"
+      },
+      {
+        "text": "Greetings from Carolina\\! I'm bored to death at work so I decided to check out your blog on my iphone during lunch break. I really like the information you provide here and can't wait to take a look when I get home. I'm amazed at how fast your blog loaded on my phone .. I'm not even using WIFI, just 3G .. Anyways, fantastic site\\!\r\nnorth face jackets for women http://ltfcjmwhsw.blinkweb.com/new-blog.html",
+        "attachments": [],
+        "author": "nobody",
+        "timestamp": "2012-11-16 12:49:26",
+        "last_edited": null,
+        "slug": "31d3",
+        "subject": "#6 Stats enhancement from Andy Juniper"
+      },
+      {
+        "text": "Do you mind if I quote a couple of your articles as long as I provide credit and sources back to your weblog? My blog site is in the exact same area of interest as yours and my visitors would really benefit from a lot of the information you present here. Please let me know if this alright with you. Regards\\!\r\nnorth face jackets on sale http://vzbeclxtke.jimdo.com/2012/11/15/cheap-north-face-jackets-whether-you-are-wearing-a-dress-or-a-pantsuit/",
+        "attachments": [],
+        "author": "nobody",
+        "timestamp": "2012-11-17 13:20:27",
+        "last_edited": null,
+        "slug": "1521",
+        "subject": "#6 Stats enhancement from Andy Juniper"
+      }
+    ],
+    "discussion_id": "518aabb45fcbc979b923a2dd",
+    "subject": ""
+  },
+  "mod_date": "2007-03-26 21:07:42",
+  "votes_down": 0,
+  "votes_up": 0,
+  "_id": "518aabbb5fcbc979b923a38e",
+  "discussion_thread_url": "http://sourceforge.net/rest/p/echoping/patches/_discuss/thread/02ec69da/",
+  "ticket_num": 6,
+  "custom_fields": {
+    "_priority": "5"
+  },
+  "created_date": "2006-04-12 07:50:38"
+},{
+  "status": "open-later",
+  "reported_by_id": "514b78ad34309d5f016e9029",
+  "related_artifacts": [],
+  "attachments": [],
+  "reported_by": "dawn_guy",
+  "assigned_to": "bortz",
+  "labels": [],
+  "discussion_disabled": false,
+  "assigned_to_id": "4f3540db0594ca2bc0000b32",
+  "private": false,
+  "summary": "SMTP enhancement from Dawn Keenan",
+  "description": "The attached patch makes echoping more friendly towards\r\nSMTP servers as well as more accurate with respect to\r\nreal time response.  Wait for the greeting before\r\nsending HELO to the mail server and then provide the\r\nstart of an email conversation in a way that isn't\r\nlikely to generate spurious warnings in the probed\r\nhost's syslog.",
+  "discussion_thread": {
+    "_id": "884a274b",
+    "posts": [
+      {
+        "text": "echoping.c context diff",
+        "attachments": [
+          {
+            "url": "http://sourceforge.net/p/echoping/patches/_discuss/thread/884a274b/21ba/attachment/echoping.c.diff",
+            "bytes": 1259
+          }
+        ],
+        "author": "dawn_guy",
+        "timestamp": "2006-06-26 14:53:45",
+        "last_edited": null,
+        "slug": "21ba",
+        "subject": "#7 SMTP enhancement from Dawn Keenan"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nI don't think that sending \"HELO echoping\" is a good idea.\r\n\r\n1\\) It is not a legal host name and, today, with the spam problem, many sites test that\r\n\r\n2\\) Even if it were \\(HELO echoping.sourceforge.net\\), various anti-spam techniques would do more aggressive testing and probably reject.\r\n\r\nThe issue stays open. I agree with your goals but there is no simple solution.\r\n",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-08 10:28:35",
+        "last_edited": null,
+        "slug": "4a6f",
+        "subject": "#7 SMTP enhancement from Dawn Keenan"
+      },
+      {
+        "text": "- **assigned_to**: nobody --> bortz",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-08 10:28:35",
+        "last_edited": null,
+        "slug": "316a",
+        "subject": "#7 SMTP enhancement from Dawn Keenan"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\n> Wait for the greeting before\r\n> sending HELO to the mail server\r\n\r\nThis is a very good idea. Committed in Subversion, r 359.\r\n",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-08 10:34:34",
+        "last_edited": null,
+        "slug": "38af",
+        "subject": "#7 SMTP enhancement from Dawn Keenan"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nThe patch to wait the greeting has been shipped with echoping 6.\r\n\r\nThe idea to add a HELO is good but postponed.\r\n",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-26 21:32:39",
+        "last_edited": null,
+        "slug": "7035",
+        "subject": "#7 SMTP enhancement from Dawn Keenan"
+      },
+      {
+        "text": "- **status**: open --> open-later",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-03-26 21:32:39",
+        "last_edited": null,
+        "slug": "c711",
+        "subject": "#7 SMTP enhancement from Dawn Keenan"
+      },
+      {
+        "text": "Logged In: YES \nuser\\_id=25865\nOriginator: NO\n\nSee \\#1692780",
+        "attachments": [],
+        "author": "bortz",
+        "timestamp": "2007-04-02 10:27:50",
+        "last_edited": null,
+        "slug": "29c2",
+        "subject": "#7 SMTP enhancement from Dawn Keenan"
+      }
+    ],
+    "discussion_id": "518aabb45fcbc979b923a2dd",
+    "subject": ""
+  },
+  "mod_date": "2007-03-26 21:32:39",
+  "votes_down": 0,
+  "votes_up": 0,
+  "_id": "518aabbf5fcbc979b923a3d1",
+  "discussion_thread_url": "http://sourceforge.net/rest/p/echoping/patches/_discuss/thread/884a274b/",
+  "ticket_num": 7,
+  "custom_fields": {
+    "_priority": "5"
+  },
+  "created_date": "2006-06-26 14:53:45"
+},{
+  "status": "open",
+  "reported_by_id": "4f3540db0594ca2bc0000b32",
+  "related_artifacts": [],
+  "attachments": [],
+  "reported_by": "bortz",
+  "assigned_to": "bortz",
+  "labels": [],
+  "discussion_disabled": false,
+  "assigned_to_id": "4f3540db0594ca2bc0000b32",
+  "private": false,
+  "summary": "Hanging fgets if the server is down",
+  "description": "Sent from \"Moelaert, J.P. \\(Johan\\)\" <J.P.Moelaert@utwente.nl>. Not confirmed with echoping 6.\r\n\r\n\r\nI've been using echoping for a month to test if a proxyserver.\r\nSince yesterday I wanted tio use it to test if a webhare server was\r\nrunning.\r\nThe command used was:\r\n\r\nechoping -t1 -h https://webhare.utwente.nl weblx030.civ.utwente.nl:80\r\n\r\nIt seemed to work.\r\nBut when the website was down the command seemed to hang in its fgets\r\ncall.\r\nExport help refered me to\r\n\r\nhttp://groups.google.com/group/comp.os.linux.development.system/browse\\_f\r\nrm/thread/20118509359c9292/19bd5388e468c1fa?lnk=st&q=SIGALRM+fgets&rnum=\r\n12&hl=en\\#19bd5388e468c1fa\r\n<http://groups.google.com/group/comp.os.linux.development.system/browse\\_\r\nfrm/thread/20118509359c9292/19bd5388e468c1fa?lnk=st&q=SIGALRM+fgets&rnum\r\n=12&hl=en\\#19bd5388e468c1fa>\r\n\r\nThis describes a similar problem with fgets.\r\nI added the following to readline.c in the function readline\r\n\r\nfd\\_set rfds;\r\nstruct timeval tv;\r\nint retval, fd= fileno\\(fs\\);\r\n\r\n/\\* watch fildescriptor to see when it has input. \\*/\r\nFD\\_ZERO\\(&rfds\\);\r\nFD\\_SET\\(fd, &rfds\\);\r\n/\\* wait up to number of seconds indicated by timeout \\*/\r\ntv.tv\\_sec = timeout;\r\ntv.tv\\_usec = 0;\r\n/\\* use select to determine readability \\*/\r\nretval = select\\( fd, &rfds, NULL, NULL, &tv \\);\r\n\r\n/\\* let's see what we got \\*/\r\nif \\( retval == -1 \\) \\{\r\nperror\\(\"select\\(\\)\"\\);\r\nreturn \\(-1\\);\r\n\\} else if \\( retval == 0 \\) \\{\r\n/\\* timeout reached \\*/\r\nreturn \\(-1\\);         \r\n\\}\r\n/\\* passed the select; start reading from a valid stream \\*/\r\n\r\nI also brought the timeout in main from echoping.c to global level.\r\nThis was then declared as external in readline.c\r\n\r\nThis solved my problem with a hanging fgets.\r\n",
+  "discussion_thread": {
+    "_id": "48ab69c7",
+    "posts": [
+      {
+        "text": "k6WEof  <a href=\"http://gosjohgbbzhk.com/\">gosjohgbbzhk</a>, \\[url=http://ufkdhpznjmpw.com/\\]ufkdhpznjmpw\\[/url\\], \\[link=http://nhafrpxtcgyw.com/\\]nhafrpxtcgyw\\[/link\\], http://tvuxugxrdfgj.com/",
+        "attachments": [],
+        "author": "nobody",
+        "timestamp": "2013-04-15 07:48:11",
+        "last_edited": null,
+        "slug": "521f",
+        "subject": "#8 Hanging fgets if the server is down"
+      }
+    ],
+    "discussion_id": "518aabb45fcbc979b923a2dd",
+    "subject": ""
+  },
+  "mod_date": "2007-03-26 21:09:01",
+  "votes_down": 0,
+  "votes_up": 0,
+  "_id": "518aabc05fcbc979b923a402",
+  "discussion_thread_url": "http://sourceforge.net/rest/p/echoping/patches/_discuss/thread/48ab69c7/",
+  "ticket_num": 8,
+  "custom_fields": {
+    "_priority": "5"
+  },
+  "created_date": "2007-03-26 21:09:01"
+},{
+  "status": "open",
+  "reported_by_id": "518aabc15fcbc979b923a410",
+  "related_artifacts": [],
+  "attachments": [],
+  "reported_by": "zu2",
+  "assigned_to": null,
+  "labels": [],
+  "discussion_disabled": false,
+  "assigned_to_id": null,
+  "private": false,
+  "summary": "'Cannot load \".so\"' patch on CentOS 5.4",
+  "description": "When running echoping 6.0.2 on the CentOS 5.4 with option \"-m\", it becomes an error. \r\n\r\nThe same variable is used at line 476 in echoping.c , as the destination and the argument of sprintf.\r\n\r\nI think that is reason for 'Cannot load \".so\"'.\r\n\r\nI wrote a patch here. \r\n\r\nthanks.",
+  "discussion_thread": {
+    "_id": "feaaf7e8",
+    "posts": [
+      {
+        "text": "",
+        "attachments": [
+          {
+            "url": "http://sourceforge.net/p/echoping/patches/_discuss/thread/feaaf7e8/d995/attachment/echoping.patch.txt",
+            "bytes": 652
+          }
+        ],
+        "author": "zu2",
+        "timestamp": "2010-01-21 12:19:35",
+        "last_edited": null,
+        "slug": "d995",
+        "subject": "#9 'Cannot load \".so\"' patch on CentOS 5.4"
+      },
+      {
+        "text": "\\# ./echoping -m dns\r\nCannot load \".so\" \\(I tried the short name, then the complete name in \"/usr/lib/echoping\"\\): /usr/lib/echoping/.so: cannot open shared object file: No such file or directory\r\n\\#\r\n",
+        "attachments": [],
+        "author": "zu2",
+        "timestamp": "2010-01-21 12:20:22",
+        "last_edited": null,
+        "slug": "b050",
+        "subject": "#9 'Cannot load \".so\"' patch on CentOS 5.4"
+      },
+      {
+        "text": "g3VkG7  <a href=\"http://owhoajeejjei.com/\">owhoajeejjei</a>, \\[url=http://qsyegjeevmkc.com/\\]qsyegjeevmkc\\[/url\\], \\[link=http://rirzyefjjvhb.com/\\]rirzyefjjvhb\\[/link\\], http://rhwqixzbyfza.com/",
+        "attachments": [],
+        "author": "nobody",
+        "timestamp": "2013-04-15 20:16:36",
+        "last_edited": null,
+        "slug": "c13b",
+        "subject": "#9 'Cannot load \".so\"' patch on CentOS 5.4"
+      }
+    ],
+    "discussion_id": "518aabb45fcbc979b923a2dd",
+    "subject": ""
+  },
+  "mod_date": "2010-01-21 12:19:35",
+  "votes_down": 0,
+  "votes_up": 0,
+  "_id": "518aabc15fcbc979b923a40f",
+  "discussion_thread_url": "http://sourceforge.net/rest/p/echoping/patches/_discuss/thread/feaaf7e8/",
+  "ticket_num": 9,
+  "custom_fields": {
+    "_priority": "5"
+  },
+  "created_date": "2010-01-21 12:19:35"
+}],
+"tracker_config":{
+  "_id": "518aabb45fcbc979b923a2db",
+  "options": {
+    "ordinal": 7,
+    "import_id": "tracker/304581",
+    "mount_point": "patches",
+    "TicketMonitoringType": null,
+    "EnableVoting": false,
+    "TicketMonitoringEmail": "",
+    "mount_label": "Patches"
+  }
+},
+"milestones":[],
+"custom_fields":[
+  {
+    "milestones": [],
+    "type": "milestone",
+    "name": "_milestone",
+    "label": "Group"
+  },
+  {
+    "label": "Priority",
+    "type": "select",
+    "options": "1 2 3 4 *5 6 7 8 9",
+    "name": "_priority"
+  }
+],
+"open_status_names":"open unread accepted pending open-fixed open-later",
+"closed_status_names":"wont-fix closed-fixed closed-duplicate closed-out-of-date",
+"saved_bins":[
+  {
+    "sort": "mod_date_dt desc",
+    "_id": "518aabb45fcbc979b923a2e4",
+    "terms": "!status:closed-duplicate && !status:wont-fix && !status:closed-fixed && !status:closed-out-of-date",
+    "summary": "Changes"
+  },
+  {
+    "sort": "",
+    "_id": "518aabb45fcbc979b923a2e3",
+    "terms": "status:closed-duplicate or status:wont-fix or status:closed-fixed or status:closed-out-of-date",
+    "summary": "Closed Tickets"
+  },
+  {
+    "sort": "",
+    "_id": "518aabb45fcbc979b923a2e2",
+    "terms": "!status:closed-duplicate && !status:wont-fix && !status:closed-fixed && !status:closed-out-of-date",
+    "summary": "Open Tickets"
+  }
+]}