From b95114936f9fc12816035db92beb3def4b5b0506 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Sat, 6 Sep 2008 13:59:48 +0200 Subject: changed port attribute to "portnum". modified: bchannel.c modified: default/interface.conf modified: interface.c modified: mISDN.cpp modified: route.c --- interface.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'interface.c') diff --git a/interface.c b/interface.c index 1adc838..98a87ac 100644 --- a/interface.c +++ b/interface.c @@ -257,6 +257,11 @@ static int inter_hunt(struct interface *interface, char *filename, int line, cha return(0); } static int inter_port(struct interface *interface, char *filename, int line, char *parameter, char *value) +{ + SPRINT(interface_error, "Error in %s (line %d): parameter '%s' is outdated.\nPlease use 'portnum' and decrease port number by 1! Ports are counted from 0 now.\n", filename, line, parameter); + return(-1); +} +static int inter_portnum(struct interface *interface, char *filename, int line, char *parameter, char *value) { struct interface_port *ifport, **ifportp; struct interface *searchif; @@ -297,6 +302,11 @@ static int inter_port(struct interface *interface, char *filename, int line, cha *ifportp = ifport; return(0); } +static int inter_portname(struct interface *interface, char *filename, int line, char *parameter, char *value) +{ + SPRINT(interface_error, "Error in %s (line %d): parameter '%s' not implemented yet.\n", filename, line, parameter); + return(-1); +} static int inter_l2hold(struct interface *interface, char *filename, int line, char *parameter, char *value) { struct interface_port *ifport; @@ -853,6 +863,10 @@ struct interface_param interface_param[] = { "Select the algorithm for selecting port with free channel."}, {"port", &inter_port, "", + ""}, + {"portnum", &inter_portnum, "", + "Give exactly one port for this interface.\nTo give multiple ports, add more lines with port parameters."}, + {"portname", &inter_portname, "", "Give exactly one port for this interface.\nTo give multiple ports, add more lines with port parameters."}, {"block", &inter_block, "", @@ -1308,15 +1322,19 @@ void doc_interface(void) ifparam = interface_param; while(ifparam->name) { - printf("%s %s\n", ifparam->name, ifparam->usage); + if (ifparam->name[0]) + printf("%s %s\n", ifparam->name, ifparam->usage); ifparam++; } ifparam = interface_param; while(ifparam->name) { - printf("\nParameter: %s %s\n", ifparam->name, ifparam->usage); - printf("%s\n", ifparam->help); + if (ifparam->name[0]) + { + printf("\nParameter: %s %s\n", ifparam->name, ifparam->usage); + printf("%s\n", ifparam->help); + } ifparam++; } } -- cgit v1.2.3-55-g7522