Import to git from cvs. Remove keywords.

diff --git a/arp.c b/arp.c
index 5fad15d..6d55756 100644 (file)
--- a/arp.c
+++ b/arp.c
@@ -1,7 +1,5 @@
 // L2TPNS: arp
 
-char const *cvs_id_arp = "$Id: arp.c,v 1.7 2005-07-31 10:04:09 bodea Exp $";
-
 #include <string.h>
 #include <unistd.h>
 #include <net/ethernet.h>

diff --git a/autosnoop.c b/autosnoop.c
index 570c147..ddc699f 100644 (file)
--- a/autosnoop.c
+++ b/autosnoop.c
@@ -4,8 +4,6 @@
 
 /* set up intercept based on RADIUS reply */
 
-char const *cvs_id = "$Id: autosnoop.c,v 1.12 2005-10-11 09:04:53 bodea Exp $";
-
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *f = 0;
 

diff --git a/autothrottle.c b/autothrottle.c
index 7f044f4..73f9a94 100644 (file)
--- a/autothrottle.c
+++ b/autothrottle.c
@@ -13,8 +13,6 @@
  * throttle=no
  */
 
-char const *cvs_id = "$Id: autothrottle.c,v 1.17 2006-05-18 14:40:31 bodea Exp $";
-
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *f = 0;
 

diff --git a/bgp.c b/bgp.c
index b5f2bf3..ea4ef45 100644 (file)
--- a/bgp.c
+++ b/bgp.c
@@ -10,8 +10,6 @@
  *   nor RFC2385 (which requires a kernel patch on 2.4 kernels).
  */
 
-char const *cvs_id_bgp = "$Id: bgp.c,v 1.12 2005-09-02 23:39:36 bodea Exp $";
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>

diff --git a/bgp.h b/bgp.h
index 55b0ee3..8540375 100644 (file)
--- a/bgp.h
+++ b/bgp.h
@@ -200,6 +200,4 @@ int bgp_set_poll(void);
 int bgp_process(uint32_t events[]);
 char const *bgp_state_str(enum bgp_state state);
 
-extern char const *cvs_id_bgp;
-
 #endif /* __BGP_H__ */

diff --git a/cli.c b/cli.c
index 12f4641..1149815 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -1,9 +1,6 @@
 // L2TPNS Command Line Interface
 // vim: sw=8 ts=8
 
-char const *cvs_name = "$Name:  $";
-char const *cvs_id_cli = "$Id: cli.c,v 1.76 2006-12-18 12:08:28 bodea Exp $";
-
 #include <stdio.h>
 #include <stddef.h>
 #include <stdarg.h>
@@ -794,72 +791,10 @@ static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, i
 
 static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc)
 {
-       int tag = 0;
-       int file = 0;
-       int i = 0;
-
        if (CLI_HELP_REQUESTED)
-               return cli_arg_help(cli, 1,
-                       "tag", "Include CVS release tag",
-                       "file", "Include file versions",
-                       NULL);
-
-       for (i = 0; i < argc; i++)
-               if (!strcmp(argv[i], "tag"))
-                       tag++;
-               else if (!strcmp(argv[i], "file"))
-                       file++;
+               return CLI_HELP_NO_ARGS;
 
        cli_print(cli, "L2TPNS %s", VERSION);
-       if (tag)
-       {
-               char const *p = strchr(cvs_name, ':');
-               char const *e;
-               if (p)
-               {
-                       p++;
-                       while (isspace(*p))
-                               p++;
-               }
-
-               if (!p || *p == '$')
-                       p = "HEAD";
-
-               e = strpbrk(p, " \t$");
-               cli_print(cli, "Tag: %.*s", (int) (e ? e - p + 1 : strlen(p)), p);
-       }
-       
-       if (file)
-       {
-               extern linked_list *loaded_plugins;
-               void *p;
-
-               cli_print(cli, "Files:");
-               cli_print(cli, "  %s", cvs_id_arp);
-#ifdef BGP
-               cli_print(cli, "  %s", cvs_id_bgp);
-#endif /* BGP */
-               cli_print(cli, "  %s", cvs_id_cli);
-               cli_print(cli, "  %s", cvs_id_cluster);
-               cli_print(cli, "  %s", cvs_id_constants);
-               cli_print(cli, "  %s", cvs_id_control);
-               cli_print(cli, "  %s", cvs_id_icmp);
-               cli_print(cli, "  %s", cvs_id_l2tpns);
-               cli_print(cli, "  %s", cvs_id_ll);
-               cli_print(cli, "  %s", cvs_id_ppp);
-               cli_print(cli, "  %s", cvs_id_radius);
-               cli_print(cli, "  %s", cvs_id_tbf);
-               cli_print(cli, "  %s", cvs_id_util);
-
-               ll_reset(loaded_plugins);
-               while ((p = ll_next(loaded_plugins)))
-               {
-                       char const **id = dlsym(p, "cvs_id");
-                       if (id)
-                               cli_print(cli, "  %s", *id);
-               }
-       }
-
        return CLI_OK;
 }
 

diff --git a/cluster.c b/cluster.c
index 42db014..8f0fa2e 100644 (file)
--- a/cluster.c
+++ b/cluster.c
@@ -1,7 +1,5 @@
 // L2TPNS Clustering Stuff
 
-char const *cvs_id_cluster = "$Id: cluster.c,v 1.55 2009-12-08 14:49:28 bodea Exp $";
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

diff --git a/constants.c b/constants.c
index b62b5dd..2b9b35c 100644 (file)
--- a/constants.c
+++ b/constants.c
@@ -1,7 +1,5 @@
 // L2TPNS: constants
 
-char const *cvs_id_constants = "$Id: constants.c,v 1.8 2009-12-08 14:49:28 bodea Exp $";
-
 #include <stdio.h>
 #include "constants.h"
 

diff --git a/control.c b/control.c
index 805a90b..3d38b22 100644 (file)
--- a/control.c
+++ b/control.c
@@ -1,7 +1,5 @@
 // L2TPNS: control
 
-char const *cvs_id_control = "$Id: control.c,v 1.5 2005-07-31 10:04:10 bodea Exp $";
-
 #include <string.h>
 #include "l2tpns.h"
 #include "control.h"

diff --git a/garden.c b/garden.c
index 30439f1..994ecb5 100644 (file)
--- a/garden.c
+++ b/garden.c
@@ -9,8 +9,6 @@
 
 /* walled garden */
 
-char const *cvs_id = "$Id: garden.c,v 1.25 2006-02-23 01:07:23 bodea Exp $";
-
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *f = 0;
 

diff --git a/icmp.c b/icmp.c
index 86c9bdf..6d90467 100644 (file)
--- a/icmp.c
+++ b/icmp.c
@@ -1,7 +1,5 @@
 // L2TPNS: icmp
 
-char const *cvs_id_icmp = "$Id: icmp.c,v 1.11 2006-04-27 09:53:49 bodea Exp $";
-
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <netinet/in.h>

diff --git a/l2tpns.c b/l2tpns.c
index 54c2f43..3b61951 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,8 +4,6 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.176 2011-01-20 12:48:40 bodea Exp $";
-
 #include <arpa/inet.h>
 #include <assert.h>
 #include <errno.h>

diff --git a/l2tpns.h b/l2tpns.h
index c68d9c3..631f656 100644 (file)
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -948,19 +948,4 @@ extern uint16_t MSS;
 #define CLI_HELP_REQUESTED     (argc > 0 && argv[argc-1][strlen(argv[argc-1])-1] == '?')
 #define CLI_HELP_NO_ARGS       (argc > 1 || argv[0][1]) ? CLI_OK : cli_arg_help(cli, 1, NULL)
 
-// CVS identifiers (for "show version file")
-extern char const *cvs_id_arp;
-extern char const *cvs_id_cli;
-extern char const *cvs_id_cluster;
-extern char const *cvs_id_constants;
-extern char const *cvs_id_control;
-extern char const *cvs_id_icmp;
-extern char const *cvs_id_l2tpns;
-extern char const *cvs_id_ll;
-extern char const *cvs_id_md5;
-extern char const *cvs_id_ppp;
-extern char const *cvs_id_radius;
-extern char const *cvs_id_tbf;
-extern char const *cvs_id_util;
-
 #endif /* __L2TPNS_H__ */

diff --git a/ll.c b/ll.c
index a65b2e4..1b2acad 100644 (file)
--- a/ll.c
+++ b/ll.c
@@ -1,7 +1,5 @@
 // L2TPNS Linked List Stuff
 
-char const *cvs_id_ll = "$Id: ll.c,v 1.6 2004-11-18 08:12:55 bodea Exp $";
-
 #include <stdio.h>
 #include <sys/file.h>
 #include <sys/stat.h>

diff --git a/ppp.c b/ppp.c
index 94cc5fa..bbd2244 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -1,7 +1,5 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.104 2009-12-08 14:49:28 bodea Exp $";
-
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/radius.c b/radius.c
index 9c28157..7ad2ec3 100644 (file)
--- a/radius.c
+++ b/radius.c
@@ -1,7 +1,5 @@
 // L2TPNS Radius Stuff
 
-char const *cvs_id_radius = "$Id: radius.c,v 1.56 2009-12-08 14:49:28 bodea Exp $";
-
 #include <time.h>
 #include <stdio.h>
 #include <sys/types.h>

diff --git a/sessionctl.c b/sessionctl.c
index cc7a13d..805b794 100644 (file)
--- a/sessionctl.c
+++ b/sessionctl.c
@@ -5,8 +5,6 @@
 
 /* session control */
 
-char const *cvs_id = "$Id: sessionctl.c,v 1.5 2006-04-13 11:14:35 bodea Exp $";
-
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *f = 0;
 

diff --git a/setrxspeed.c b/setrxspeed.c
index 7a5acd9..52fcf4a 100644 (file)
--- a/setrxspeed.c
+++ b/setrxspeed.c
@@ -4,8 +4,6 @@
 
 /* fudge up session rx speed if not set */
 
-char const *cvs_id = "$Id: setrxspeed.c,v 1.4 2005-10-11 09:04:53 bodea Exp $";
-
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *f = 0;
 

diff --git a/snoopctl.c b/snoopctl.c
index 943294f..d538a23 100644 (file)
--- a/snoopctl.c
+++ b/snoopctl.c
@@ -5,8 +5,6 @@
 
 /* snoop control */
 
-char const *cvs_id = "$Id: snoopctl.c,v 1.7 2005-10-11 09:04:53 bodea Exp $";
-
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *f = 0;
 

diff --git a/stripdomain.c b/stripdomain.c
index c1dcea0..877617e 100644 (file)
--- a/stripdomain.c
+++ b/stripdomain.c
@@ -4,8 +4,6 @@
 
 /* strip domain part of username before sending RADIUS requests */
 
-char const *cvs_id = "$Id: stripdomain.c,v 1.8 2005-10-11 09:04:53 bodea Exp $";
-
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *f = 0;
 

diff --git a/tbf.c b/tbf.c
index 9b4993d..c6273ce 100644 (file)
--- a/tbf.c
+++ b/tbf.c
@@ -1,7 +1,5 @@
 // L2TPNS: token bucket filters
 
-char const *cvs_id_tbf = "$Id: tbf.c,v 1.13 2005-07-31 10:04:10 bodea Exp $";
-
 #include <string.h>
 #include "l2tpns.h"
 #include "util.h"

diff --git a/throttlectl.c b/throttlectl.c
index 46ce824..adcff27 100644 (file)
--- a/throttlectl.c
+++ b/throttlectl.c
@@ -5,8 +5,6 @@
 
 /* throttle control */
 
-char const *cvs_id = "$Id: throttlectl.c,v 1.9 2005-10-11 09:04:53 bodea Exp $";
-
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *f = 0;
 

diff --git a/util.c b/util.c
index 7237c08..0ab1d92 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,7 +1,5 @@
 /* Misc util functions */
 
-char const *cvs_id_util = "$Id: util.c,v 1.14 2006-04-05 01:45:57 bodea Exp $";
-
 #include <unistd.h>
 #include <errno.h>
 #include <sched.h>