welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove unused MAC config type

Browse source
This commit is contained in:
bodea 2005-12-06 00:00:31 +00:00
parent 560fad4be9
commit 5a24a99c38
3 changed files with 4 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Changes
View file

@ -4,6 +4,7 @@
BuildRoot to include username. BuildRoot to include username.
- Fix IPCP negotiation of secondary DNS server, reported by Jon Morby. - Fix IPCP negotiation of secondary DNS server, reported by Jon Morby.
- Clean up sessiont, removing some unused fields. - Clean up sessiont, removing some unused fields.
- Remove unused "MAC" config type.
* Thu Nov 17 2005 Brendan O'Dea <bod@optus.net> 2.1.12 * Thu Nov 17 2005 Brendan O'Dea <bod@optus.net> 2.1.12
- Set MTU on tunnel interface so the kernel will re-fragment large - Set MTU on tunnel interface so the kernel will re-fragment large

23
cli.c
View file

@ -2,7 +2,7 @@
// vim: sw=8 ts=8 // vim: sw=8 ts=8
char const *cvs_name = "$Name: $"; char const *cvs_name = "$Name: $";
char const *cvs_id_cli = "$Id: cli.c,v 1.69 2005/12/05 14:10:42 bodea Exp $"; char const *cvs_id_cli = "$Id: cli.c,v 1.70 2005/12/06 00:00:31 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <stddef.h> #include <stddef.h>
@ -964,14 +964,6 @@ static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int arg
cli_print(cli, "set %s %d", config_values[i].key, *(int *) value); cli_print(cli, "set %s %d", config_values[i].key, *(int *) value);
else if (config_values[i].type == UNSIGNED_LONG) else if (config_values[i].type == UNSIGNED_LONG)
cli_print(cli, "set %s %lu", config_values[i].key, *(unsigned long *) value); cli_print(cli, "set %s %lu", config_values[i].key, *(unsigned long *) value);
else if (config_values[i].type == MAC)
cli_print(cli, "set %s %02x%02x.%02x%02x.%02x%02x", config_values[i].key,
*(unsigned short *) (value + 0),
*(unsigned short *) (value + 1),
*(unsigned short *) (value + 2),
*(unsigned short *) (value + 3),
*(unsigned short *) (value + 4),
*(unsigned short *) (value + 5));
} }
cli_print(cli, "# Plugins"); cli_print(cli, "# Plugins");
@ -1888,9 +1880,6 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
case IPv6: case IPv6:
inet_pton(AF_INET6, argv[1], value); inet_pton(AF_INET6, argv[1], value);
break; break;
case MAC:
parsemac(argv[1], (char *)value);
break;
case BOOL: case BOOL:
if (strcasecmp(argv[1], "yes") == 0 || strcasecmp(argv[1], "true") == 0 || strcasecmp(argv[1], "1") == 0) if (strcasecmp(argv[1], "yes") == 0 || strcasecmp(argv[1], "true") == 0 || strcasecmp(argv[1], "1") == 0)
*(int *) value = 1; *(int *) value = 1;
@ -3076,13 +3065,3 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
return CLI_OK; return CLI_OK;
} }
// Convert a string in the form of abcd.ef12.3456 into char[6]
void parsemac(char *string, char mac[6])
{
if (sscanf(string, "%02x%02x.%02x%02x.%02x%02x", (unsigned int *)&mac[0], (unsigned int *)&mac[1], (unsigned int *)&mac[2], (unsigned int *)&mac[3], (unsigned int *)&mac[4], (unsigned int *)&mac[5]) == 6)
return;
if (sscanf(string, "%02x%02x:%02x%02x:%02x%02x", (unsigned int *)&mac[0], (unsigned int *)&mac[1], (unsigned int *)&mac[2], (unsigned int *)&mac[3], (unsigned int *)&mac[4], (unsigned int *)&mac[5]) == 6)
return;
memset(mac, 0, 6);
}

4
l2tpns.h
View file

@ -1,5 +1,5 @@
// L2TPNS Global Stuff // L2TPNS Global Stuff
// $Id: l2tpns.h,v 1.102 2005/12/05 14:10:42 bodea Exp $ // $Id: l2tpns.h,v 1.103 2005/12/06 00:00:32 bodea Exp $
#ifndef __L2TPNS_H__ #ifndef __L2TPNS_H__
#define __L2TPNS_H__ #define __L2TPNS_H__
@ -614,7 +614,7 @@ typedef struct
#endif #endif
} configt; } configt;
enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6, MAC }; enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6 };
typedef struct typedef struct
{ {
char *key; char *key;