From 1bfbfbf903777d13df3107fbc89bdaeb2af9f2d6 Mon Sep 17 00:00:00 2001 From: Super User Date: Thu, 24 Apr 2008 09:24:04 +0200 Subject: socket mISDN work modified: Makefile modified: apppbx.cpp modified: default/interface.conf modified: dss1.cpp modified: interface.c modified: interface.h modified: mISDN.cpp modified: mISDN.h modified: main.h modified: options.c modified: options.h modified: route.c --- interface.c | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) (limited to 'interface.c') diff --git a/interface.c b/interface.c index aa55f36..6ac2871 100644 --- a/interface.c +++ b/interface.c @@ -155,6 +155,7 @@ static int inter_ptp(struct interface *interface, char *filename, int line, char ifport->ptp = 1; return(0); } +#if 0 static int inter_ptmp(struct interface *interface, char *filename, int line, char *parameter, char *value) { struct interface_port *ifport; @@ -183,6 +184,7 @@ static int inter_ptmp(struct interface *interface, char *filename, int line, cha ifport->ptmp = 1; return(0); } +#endif static int inter_nt(struct interface *interface, char *filename, int line, char *parameter, char *value) { #ifdef SOCKET_MISDN @@ -297,6 +299,34 @@ static int inter_port(struct interface *interface, char *filename, int line, cha *ifportp = ifport; return(0); } +static int inter_l2hold(struct interface *interface, char *filename, int line, char *parameter, char *value) +{ + struct interface_port *ifport; + + /* port in chain ? */ + if (!interface->ifport) + { + SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects previous 'port' definition.\n", filename, line, parameter); + return(-1); + } + /* goto end of chain */ + ifport = interface->ifport; + while(ifport->next) + ifport = ifport->next; + if (!strcmp(value, "yes")) + { + ifport->l2hold = 1; + } else + if (!strcmp(value, "no")) + { + ifport->l2hold = -1; + } else + { + SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expecting parameter 'yes' or 'no'.\n", filename, line, parameter); + return(-1); + } + return(0); +} static int inter_channel_out(struct interface *interface, char *filename, int line, char *parameter, char *value) { struct interface_port *ifport; @@ -836,10 +866,13 @@ struct interface_param interface_param[] = { "This is required on NT-mode ports that are multipoint by default.\n" "This parameter must follow a 'port' parameter."}, +#if 0 {"ptmp", &inter_ptmp, "", "The given port above is opened as point-to-multipoint.\n" "This is required on PRI NT-mode ports that are point-to-point by default.\n" "This parameter must follow a 'port' parameter."}, +#endif + {"nt", &inter_nt, "", "The given port above is opened in NT-mode.\n" #ifdef SOCKET_MISDN @@ -849,6 +882,11 @@ struct interface_param interface_param[] = { #endif "This parameter must follow a 'port' parameter."}, + {"layer2hold", &inter_l2hold, "yes | no", + "The given port will continuously try to establish layer 2 link and hold it.\n" + "It is required for PTP links in most cases, therefore it is default.\n" + "This parameter must follow a 'port' parameter."}, + {"channel-out", &inter_channel_out, "[force,][][,...][,free][,any][,no]", "Channel selection list for all outgoing calls to the interface.\n" "A free channels is searched in order of appearance.\n" @@ -895,13 +933,6 @@ struct interface_param interface_param[] = { "Disables DTMF detection for this interface.\n" "This parameter must follow a 'port' parameter."}, -#if 0 - {"layer2keep", &inter_layer2keep, "yes | no", - "By default, layer 2 is establised and kept up on PTP interfaces.\n" - ".\n" - "This parameter must follow a 'port' parameter."}, -#endif - {"filter", &inter_filter, " ", "Adds/appends a filter. Filters are ordered in transmit direction.\n" "gain - Changes volume (-8 .. 8)\n" @@ -1256,7 +1287,7 @@ void load_port(struct interface_port *ifport) struct mISDNport *mISDNport; /* open new port */ - mISDNport = mISDNport_open(ifport->portnum, ifport->ptp, ifport->ptmp, ifport->nt, ifport->interface); + mISDNport = mISDNport_open(ifport->portnum, ifport->ptp, ifport->nt, ifport->l2hold, ifport->interface); if (mISDNport) { /* link port */ -- cgit v1.2.3-55-g7522