Added GSM IMSI dialing by using dialing "imsi-<number>".
[lcr.git] / interface.c
index 7b90d15..24bc731 100644 (file)
@@ -9,9 +9,6 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include "main.h"
 
 struct interface *interface_first = NULL; /* first interface is current list */
@@ -23,14 +20,8 @@ void default_out_channel(struct interface_port *ifport)
 {
        struct select_channel *selchannel, **selchannelp;
 
-       selchannel = (struct select_channel *)malloc(sizeof(struct select_channel));
-       if (!selchannel)
-       {
-               PERROR("No memory!");
-               return;
-       }
+       selchannel = (struct select_channel *)MALLOC(sizeof(struct select_channel));
        memuse++;
-       memset(selchannel, 0, sizeof(struct select_channel));
        
        if (ifport->mISDNport->ntmode)
                selchannel->channel = CHANNEL_FREE;
@@ -40,17 +31,10 @@ void default_out_channel(struct interface_port *ifport)
        ifport->out_channel = selchannel;
 
        /* additional channel selection for multipoint NT ports */
-       if (!ifport->mISDNport->ptp && ifport->mISDNport->ntmode)
-       {
+       if (!ifport->mISDNport->ptp && ifport->mISDNport->ntmode) {
                selchannelp = &(selchannel->next);
-               selchannel = (struct select_channel *)malloc(sizeof(struct select_channel));
-               if (!selchannel)
-               {
-                       PERROR("No memory!");
-                       return;
-               }
+               selchannel = (struct select_channel *)MALLOC(sizeof(struct select_channel));
                memuse++;
-               memset(selchannel, 0, sizeof(struct select_channel));
                selchannel->channel = CHANNEL_NO; // call waiting
                *selchannelp = selchannel;
        }
@@ -62,14 +46,8 @@ void default_in_channel(struct interface_port *ifport)
 {
        struct select_channel *selchannel;
 
-       selchannel = (struct select_channel *)malloc(sizeof(struct select_channel));
-       if (!selchannel)
-       {
-               PERROR("No memory!");
-               return;
-       }
+       selchannel = (struct select_channel *)MALLOC(sizeof(struct select_channel));
        memuse++;
-       memset(selchannel, 0, sizeof(struct select_channel));
        
        selchannel->channel = CHANNEL_FREE;
        
@@ -98,10 +76,8 @@ static int get_number(char *value)
  * and return pointer to next element in buffer */
 static char *get_seperated(char *buffer)
 {
-       while(*buffer)
-       {
-               if (*buffer==',' || *buffer<=32) /* seperate */
-               {
+       while(*buffer) {
+               if (*buffer==',' || *buffer<=32) { /* seperate */
                        *buffer++ = '\0';
                        while((*buffer>'\0' && *buffer<=32) || *buffer==',')
                                buffer++;
@@ -120,8 +96,7 @@ static int inter_block(struct interface *interface, char *filename, int line, ch
        struct interface_port *ifport;
 
        /* port in chain ? */
-       if (!interface->ifport)
-       {
+       if (!interface->ifport) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects previous 'port' definition.\n", filename, line, parameter);
                return(-1);
        }
@@ -130,8 +105,7 @@ static int inter_block(struct interface *interface, char *filename, int line, ch
        while(ifport->next)
                ifport = ifport->next;
        /* add value */
-       if (value[0])
-       {
+       if (value[0]) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects no value.\n", filename, line, parameter);
                return(-1);
        }
@@ -140,8 +114,7 @@ static int inter_block(struct interface *interface, char *filename, int line, ch
 }
 static int inter_extension(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
-       if (value[0])
-       {
+       if (value[0]) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects no value.\n", filename, line, parameter);
                return(-1);
        }
@@ -153,13 +126,11 @@ static int inter_ptp(struct interface *interface, char *filename, int line, char
        struct interface_port *ifport;
 
        /* port in chain ? */
-       if (!interface->ifport)
-       {
+       if (!interface->ifport) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects previous 'port' definition.\n", filename, line, parameter);
                return(-1);
        }
-       if (interface->ifport->ptmp)
-       {
+       if (interface->ifport->ptmp) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' previously ptmp was given.\n", filename, line, parameter);
                return(-1);
        }
@@ -168,26 +139,24 @@ static int inter_ptp(struct interface *interface, char *filename, int line, char
        while(ifport->next)
                ifport = ifport->next;
        /* add value */
-       if (value[0])
-       {
+       if (value[0]) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects no value.\n", filename, line, parameter);
                return(-1);
        }
        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;
 
        /* port in chain ? */
-       if (!interface->ifport)
-       {
+       if (!interface->ifport) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects previous 'port' definition.\n", filename, line, parameter);
                return(-1);
        }
-       if (interface->ifport->ptp)
-       {
+       if (interface->ifport->ptp) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' previously ptp was given.\n", filename, line, parameter);
                return(-1);
        }
@@ -196,25 +165,64 @@ static int inter_ptmp(struct interface *interface, char *filename, int line, cha
        while(ifport->next)
                ifport = ifport->next;
        /* add value */
-       if (value[0])
-       {
+       if (value[0]) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects no value.\n", filename, line, parameter);
                return(-1);
        }
        ifport->ptmp = 1;
        return(0);
 }
+#endif
+static int inter_nt(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;
+       /* add value */
+       if (value[0]) {
+               SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects no value.\n", filename, line, parameter);
+               return(-1);
+       }
+       ifport->nt = 1;
+       return(0);
+}
+static int inter_tespecial(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;
+       /* add value */
+       if (value[0]) {
+               SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects no value.\n", filename, line, parameter);
+               return(-1);
+       }
+       ifport->tespecial = 1;
+       return(0);
+}
 static int inter_tones(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
-       if (!strcasecmp(value, "yes"))
-       {
+       if (!strcasecmp(value, "yes")) {
                interface->is_tones = IS_YES;
        } else
-       if (!strcasecmp(value, "no"))
-       {
+       if (!strcasecmp(value, "no")) {
                interface->is_tones = IS_NO;
-       } else
-       {
+       } else {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects value 'yes' or 'no'.\n", filename, line, parameter);
                return(-1);
        }
@@ -222,15 +230,12 @@ static int inter_tones(struct interface *interface, char *filename, int line, ch
 }
 static int inter_earlyb(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
-       if (!strcasecmp(value, "yes"))
-       {
+       if (!strcasecmp(value, "yes")) {
                interface->is_earlyb = IS_YES;
        } else
-       if (!strcasecmp(value, "no"))
-       {
+       if (!strcasecmp(value, "no")) {
                interface->is_earlyb = IS_NO;
-       } else
-       {
+       } else {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects value 'yes' or 'no'.\n", filename, line, parameter);
                return(-1);
        }
@@ -238,15 +243,12 @@ static int inter_earlyb(struct interface *interface, char *filename, int line, c
 }
 static int inter_hunt(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
-       if (!strcasecmp(value, "linear"))
-       {
+       if (!strcasecmp(value, "linear")) {
                interface->hunt = HUNT_LINEAR;
        } else
-       if (!strcasecmp(value, "roundrobin"))
-       {
+       if (!strcasecmp(value, "roundrobin")) {
                interface->hunt = HUNT_ROUNDROBIN;
-       } else
-       {
+       } else {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects value 'linear' or 'roundrobin'.\n", filename, line, parameter);
                return(-1);
        }
@@ -254,25 +256,26 @@ static int inter_hunt(struct interface *interface, char *filename, int line, cha
 }
 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;
        int val;
 
        val = get_number(value);
-       if (val == -1)
-       {
+       if (val == -1) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects one numeric value.\n", filename, line, parameter);
                return(-1);
        }
        /* check for port already assigned */
        searchif = interface_newlist;
-       while(searchif)
-       {
+       while(searchif) {
                ifport = searchif->ifport;
-               while(ifport)
-               {
-                       if (ifport->portnum == val)
-                       {
+               while(ifport) {
+                       if (ifport->portnum == val) {
                                SPRINT(interface_error, "Error in %s (line %d): port '%d' already used above.\n", filename, line, val);
                                return(-1);
                        }
@@ -281,14 +284,8 @@ static int inter_port(struct interface *interface, char *filename, int line, cha
                searchif = searchif->next;
        }
        /* alloc port substructure */
-       ifport = (struct interface_port *)malloc(sizeof(struct interface_port));
-       if (!ifport)
-       {
-               SPRINT(interface_error, "No memory!");
-               return(-1);
-       }
+       ifport = (struct interface_port *)MALLOC(sizeof(struct interface_port));
        memuse++;
-       memset(ifport, 0, sizeof(struct interface_port));
        ifport->interface = interface;
        /* set value */
        ifport->portnum = val;
@@ -299,6 +296,91 @@ 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)
+{
+       struct interface_port *ifport, **ifportp;
+       struct interface *searchif;
+
+       /* check for port already assigned */
+       searchif = interface_newlist;
+       while(searchif) {
+               ifport = searchif->ifport;
+               while(ifport) {
+                       if (!strcasecmp(ifport->portname, value)) {
+                               SPRINT(interface_error, "Error in %s (line %d): port '%s' already used above.\n", filename, line, value);
+                               return(-1);
+                       }
+//                     /* check for use as GSM */
+//                     if (ifport->gsm) {
+//                             SPRINT(interface_error, "Error in %s (line %d): Interface already used for GSM.\n", filename, line);
+//                             return(-1);
+//                     }
+                       ifport = ifport->next;
+               }
+               searchif = searchif->next;
+       }
+       /* alloc port substructure */
+       ifport = (struct interface_port *)MALLOC(sizeof(struct interface_port));
+       memuse++;
+       ifport->interface = interface;
+       /* set value */
+       ifport->portnum = -1; // disable until resolved
+       SCPY(ifport->portname, value);
+       /* tail port */
+       ifportp = &interface->ifport;
+       while(*ifportp)
+               ifportp = &((*ifportp)->next);
+       *ifportp = ifport;
+       return(0);
+}
+static int inter_l1hold(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->l1hold = 1;
+       } else
+       if (!strcmp(value, "no")) {
+               ifport->l1hold = 0;
+       } 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_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;
@@ -307,8 +389,7 @@ static int inter_channel_out(struct interface *interface, char *filename, int li
        char *p, *el;
 
        /* port in chain ? */
-       if (!interface->ifport)
-       {
+       if (!interface->ifport) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects previous 'port' definition.\n", filename, line, parameter);
                return(-1);
        }
@@ -317,57 +398,42 @@ static int inter_channel_out(struct interface *interface, char *filename, int li
        while(ifport->next)
                ifport = ifport->next;
        p = value;
-       while(*p)
-       {
+       while(*p) {
                el = p;
                p = get_seperated(p);
-               if (!strcasecmp(el, "force"))
-               {
+               if (!strcasecmp(el, "force")) {
                        ifport->channel_force = 1;
-                       if (ifport->out_channel)
-                       {
+                       if (ifport->out_channel) {
                                SPRINT(interface_error, "Error in %s (line %d): value 'force' may only appear as first element in list.\n", filename, line);
                                return(-1);
                        }
                } else
-               if (!strcasecmp(el, "any"))
-               {
+               if (!strcasecmp(el, "any")) {
                        val = CHANNEL_ANY;
                        goto selchannel;
                } else
-               if (!strcasecmp(el, "free"))
-               {
+               if (!strcasecmp(el, "free")) {
                        val = CHANNEL_FREE;
                        goto selchannel;
                } else
-               if (!strcasecmp(el, "no"))
-               {
+               if (!strcasecmp(el, "no")) {
                        val = CHANNEL_NO;
                        goto selchannel;
-               } else
-               {
+               } else {
                        val = get_number(el);
-                       if (val == -1)
-                       {
+                       if (val == -1) {
                                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects a comma seperated list of 'force', 'any', 'free', 'no' and any channel number.\n", filename, line, parameter);
                                return(-1);
                        }
 
-                       if (val<1 || val==16 || val>126)
-                       {
+                       if (val<1 || val==16 || val>126) {
                                SPRINT(interface_error, "Error in %s (line %d): channel '%d' out of range.\n", filename, line, val);
                                return(-1);
                        }
                        selchannel:
                        /* add to select-channel list */
-                       selchannel = (struct select_channel *)malloc(sizeof(struct select_channel));
-                       if (!selchannel)
-                       {
-                               SPRINT(interface_error, "No memory!");
-                               return(-1);
-                       }
+                       selchannel = (struct select_channel *)MALLOC(sizeof(struct select_channel));
                        memuse++;
-                       memset(selchannel, 0, sizeof(struct select_channel));
                        /* set value */
                        selchannel->channel = val;
                        /* tail port */
@@ -387,8 +453,7 @@ static int inter_channel_in(struct interface *interface, char *filename, int lin
        char *p, *el;
 
        /* port in chain ? */
-       if (!interface->ifport)
-       {
+       if (!interface->ifport) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects previous 'port' definition.\n", filename, line, parameter);
                return(-1);
        }
@@ -397,43 +462,31 @@ static int inter_channel_in(struct interface *interface, char *filename, int lin
        while(ifport->next)
                ifport = ifport->next;
        p = value;
-       while(*p)
-       {
+       while(*p) {
                el = p;
                p = get_seperated(p);
-               if (ifport->in_channel) if (ifport->in_channel->channel == CHANNEL_FREE)
-               {
+               if (ifport->in_channel) if (ifport->in_channel->channel == CHANNEL_FREE) {
                        SPRINT(interface_error, "Error in %s (line %d): parameter '%s' has values behind 'free' keyword. They has no effect.\n", filename, line, parameter);
                                return(-1);
                }
-               if (!strcasecmp(el, "free"))
-               {
+               if (!strcasecmp(el, "free")) {
                        val = CHANNEL_FREE;
                        goto selchannel;
-               } else
-               {
+               } else {
                        val = get_number(el);
-                       if (val == -1)
-                       {
+                       if (val == -1) {
                                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects a comma seperated list of channel numbers and 'free'.\n", filename, line, parameter);
                                return(-1);
                        }
 
-                       if (val<1 || val==16 || val>126)
-                       {
+                       if (val<1 || val==16 || val>126) {
                                SPRINT(interface_error, "Error in %s (line %d): channel '%d' out of range.\n", filename, line, val);
                                return(-1);
                        }
                        selchannel:
                        /* add to select-channel list */
-                       selchannel = (struct select_channel *)malloc(sizeof(struct select_channel));
-                       if (!selchannel)
-                       {
-                               SPRINT(interface_error, "No memory!");
-                               return(-1);
-                       }
+                       selchannel = (struct select_channel *)MALLOC(sizeof(struct select_channel));
                        memuse++;
-                       memset(selchannel, 0, sizeof(struct select_channel));
                        /* set value */
                        selchannel->channel = val;
                        /* tail port */
@@ -445,37 +498,75 @@ static int inter_channel_in(struct interface *interface, char *filename, int lin
        }
        return(0);
 }
+static int inter_timeouts(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+       struct interface_port *ifport;
+//     struct select_channel *selchannel, **selchannelp;
+//     int val;
+       char *p, *el;
+
+       /* 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;
+       p = value;
+       if (!*p) {
+               nofive:
+               SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects five timeout values.\n", filename, line, parameter);
+               return(-1);
+       }
+       el = p;
+       p = get_seperated(p);
+       ifport->tout_setup = atoi(el);
+       if (!*p)
+               goto nofive;
+       el = p;
+       p = get_seperated(p);
+       ifport->tout_dialing = atoi(el);
+       if (!*p)
+               goto nofive;
+       el = p;
+       p = get_seperated(p);
+       ifport->tout_proceeding = atoi(el);
+       if (!*p)
+               goto nofive;
+       el = p;
+       p = get_seperated(p);
+       ifport->tout_alerting = atoi(el);
+       if (!*p)
+               goto nofive;
+       el = p;
+       p = get_seperated(p);
+       ifport->tout_disconnect = atoi(el);
+       return(0);
+}
 static int inter_msn(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
        struct interface_msn *ifmsn, **ifmsnp;
        char *p, *el;
 
-       if (!value[0])
-       {
+       if (!value[0]) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects one MSN number or a list.\n", filename, line, parameter);
                return(-1);
        }
-       if (interface->ifscreen_in)
-       {
+       if (interface->ifscreen_in) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' not allowed with 'screen_in' parameter.\n", filename, line, parameter);
                return(-1);
        }
 
        /* process list */
        p = value;
-       while(*p)
-       {
+       while(*p) {
                el = p;
                p = get_seperated(p);
                /* add MSN to list */
-               ifmsn = (struct interface_msn *)malloc(sizeof(struct interface_msn));
-               if (!ifmsn)
-               {
-                       SPRINT(interface_error, "No memory!");
-                       return(-1);
-               }
+               ifmsn = (struct interface_msn *)MALLOC(sizeof(struct interface_msn));
                memuse++;
-               memset(ifmsn, 0, sizeof(struct interface_msn));
                /* set value */
                SCPY(ifmsn->msn, el);
                /* tail port */
@@ -491,23 +582,13 @@ static int inter_screen(struct interface_screen **ifscreenp, struct interface *i
        struct interface_screen *ifscreen;
        char *p, *el;
 
-       if (!value[0])
-       {
+       if (!value[0]) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects old caller ID and new caller ID.\n", filename, line, parameter);
                return(-1);
        }
-       p = value;
-       el = p;
-       p = get_seperated(p);
        /* add screen entry to list*/
-       ifscreen = (struct interface_screen *)malloc(sizeof(struct interface_screen));
-       if (!ifscreen)
-       {
-               SPRINT(interface_error, "No memory!");
-               return(-1);
-       }
+       ifscreen = (struct interface_screen *)MALLOC(sizeof(struct interface_screen));
        memuse++;
-       memset(ifscreen, 0, sizeof(struct interface_screen));
        ifscreen->match_type = -1; /* unchecked */
        ifscreen->match_present = -1; /* unchecked */
        ifscreen->result_type = -1; /* unchanged */
@@ -516,61 +597,52 @@ static int inter_screen(struct interface_screen **ifscreenp, struct interface *i
        while(*ifscreenp)
                ifscreenp = &((*ifscreenp)->next);
        *ifscreenp = ifscreen;
+//     printf("interface=%s\n", interface->name);
        /* get match */
-       while(*p)
-       {
+       p = value;
+       while(*p) {
                el = p;
                p = get_seperated(p);
-               if (!strcasecmp(el, "unknown"))
-               {
-                       if (ifscreen->match_type != -1)
-                       {
+               if (!strcasecmp(el, "unknown")) {
+                       if (ifscreen->match_type != -1) {
                                typeerror:
                                SPRINT(interface_error, "Error in %s (line %d): number type already set earlier.\n", filename, line, parameter);
                                return(-1);
                        }
                        ifscreen->match_type = INFO_NTYPE_UNKNOWN;
                } else
-               if (!strcasecmp(el, "subscriber"))
-               {
+               if (!strcasecmp(el, "subscriber")) {
                        if (ifscreen->match_type != -1)
                                goto typeerror;
                        ifscreen->match_type = INFO_NTYPE_SUBSCRIBER;
                } else
-               if (!strcasecmp(el, "national"))
-               {
+               if (!strcasecmp(el, "national")) {
                        if (ifscreen->match_type != -1)
                                goto typeerror;
                        ifscreen->match_type = INFO_NTYPE_NATIONAL;
                } else
-               if (!strcasecmp(el, "international"))
-               {
+               if (!strcasecmp(el, "international")) {
                        if (ifscreen->match_type != -1)
                                goto typeerror;
                        ifscreen->match_type = INFO_NTYPE_INTERNATIONAL;
                } else
-               if (!strcasecmp(el, "allowed"))
-               {
-                       if (ifscreen->match_present != -1)
-                       {
+               if (!strcasecmp(el, "allowed")) {
+                       if (ifscreen->match_present != -1) {
                                presenterror:
                                SPRINT(interface_error, "Error in %s (line %d): presentation type already set earlier.\n", filename, line);
                                return(-1);
                        }
                        ifscreen->match_present = INFO_PRESENT_ALLOWED;
                } else
-               if (!strcasecmp(el, "restricted"))
-               {
+               if (!strcasecmp(el, "restrict") || !strcasecmp(el, "restricted")) {
                        if (ifscreen->match_present != -1)
                                goto presenterror;
                        ifscreen->match_present = INFO_PRESENT_RESTRICTED;
                } else {
                        SCPY(ifscreen->match, el);
                        /* check for % at the end */
-                       if (strchr(el, '%'))
-                       {
-                               if (strchr(el, '%') != el+strlen(el)-1)
-                               {
+                       if (strchr(el, '%')) {
+                               if (strchr(el, '%') != el+strlen(el)-1) {
                                        SPRINT(interface_error, "Error in %s (line %d): %% joker found, but must at the end.\n", filename, line, parameter);
                                        return(-1);
                                }
@@ -578,58 +650,48 @@ static int inter_screen(struct interface_screen **ifscreenp, struct interface *i
                        break;
                }
        }
-       if (ifscreen->match[0] == '\0')
-       {
+       if (ifscreen->match[0] == '\0') {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects old caller ID.\n", filename, line, parameter);
                return(-1);
        }
        /* get result */
-       while(*p)
-       {
+       while(*p) {
                el = p;
                p = get_seperated(p);
-               if (!strcasecmp(el, "unknown"))
-               {
+               if (!strcasecmp(el, "unknown")) {
                        if (ifscreen->result_type != -1)
                                goto typeerror;
                        ifscreen->result_type = INFO_NTYPE_UNKNOWN;
                } else
-               if (!strcasecmp(el, "subscriber"))
-               {
+               if (!strcasecmp(el, "subscriber")) {
                        if (ifscreen->result_type != -1)
                                goto typeerror;
                        ifscreen->result_type = INFO_NTYPE_SUBSCRIBER;
                } else
-               if (!strcasecmp(el, "national"))
-               {
+               if (!strcasecmp(el, "national")) {
                        if (ifscreen->result_type != -1)
                                goto typeerror;
                        ifscreen->result_type = INFO_NTYPE_NATIONAL;
                } else
-               if (!strcasecmp(el, "international"))
-               {
+               if (!strcasecmp(el, "international")) {
                        if (ifscreen->result_type != -1)
                                goto typeerror;
                        ifscreen->result_type = INFO_NTYPE_INTERNATIONAL;
                } else
-               if (!strcasecmp(el, "allowed"))
-               {
+               if (!strcasecmp(el, "present") || !strcasecmp(el, "presented") || !strcasecmp(el, "allowed") || !strcasecmp(el, "allow")) {
                        if (ifscreen->result_present != -1)
                                goto presenterror;
                        ifscreen->result_present = INFO_PRESENT_ALLOWED;
                } else
-               if (!strcasecmp(el, "restricted"))
-               {
+               if (!strcasecmp(el, "restrict") || !strcasecmp(el, "restricted") || !strcasecmp(el, "deny") || !strcasecmp(el, "denied")) {
                        if (ifscreen->result_present != -1)
                                goto presenterror;
                        ifscreen->result_present = INFO_PRESENT_RESTRICTED;
                } else {
                        SCPY(ifscreen->result, el);
                        /* check for % at the end */
-                       if (strchr(el, '%'))
-                       {
-                               if (strchr(el, '%') != el+strlen(el)-1)
-                               {
+                       if (strchr(el, '%')) {
+                               if (strchr(el, '%') != el+strlen(el)-1) {
                                        SPRINT(interface_error, "Error in %s (line %d): %% joker found, but must at the end.\n", filename, line, parameter);
                                        return(-1);
                                }
@@ -637,8 +699,7 @@ static int inter_screen(struct interface_screen **ifscreenp, struct interface *i
                        break;
                }
        }
-       if (ifscreen->result[0] == '\0')
-       {
+       if (ifscreen->result[0] == '\0') {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects new caller ID.\n", filename, line, parameter);
                return(-1);
        }
@@ -646,8 +707,7 @@ static int inter_screen(struct interface_screen **ifscreenp, struct interface *i
 }
 static int inter_screen_in(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
-       if (interface->ifmsn)
-       {
+       if (interface->ifmsn) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' not allowed with 'msn' parameter.\n", filename, line, parameter);
                return(-1);
        }
@@ -663,8 +723,7 @@ static int inter_nodtmf(struct interface *interface, char *filename, int line, c
        struct interface_port *ifport;
 
        /* port in chain ? */
-       if (!interface->ifport)
-       {
+       if (!interface->ifport) {
                SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects previous 'port' definition.\n", filename, line, parameter);
                return(-1);
        }
@@ -675,13 +734,171 @@ static int inter_nodtmf(struct interface *interface, char *filename, int line, c
        ifport->nodtmf = 1;
        return(0);
 }
-#warning filter to be done
-#if 0
 static int inter_filter(struct interface *interface, char *filename, int line, char *parameter, char *value)
 {
+       char *p, *q;
+
+       /* seperate parameter from filter */
+       p = value;
+       while(*p > 32)
+               p++;
+       if (*p) {
+               *p++ = 0;
+               while(*p > 0 && *p <= 32)
+                       p++;
+       }
+
+       if (!strcasecmp(value, "gain")) {
+               q = p;
+               while(*q > 32)
+                       q++;
+               if (*q) {
+                       *q++ = 0;
+                       while(*q > 0 && *q <= 32)
+                               q++;
+               }
+               if (*p == 0 || *q == 0) {
+                       SPRINT(interface_error, "Error in %s (line %d): parameter '%s %s' expects two gain values.\n", filename, line, parameter, value);
+                       return(-1);
+               }
+               if (atoi(p)<-8 || atoi(p)>8 || atoi(q)<-8 || atoi(q)>8) {
+                       SPRINT(interface_error, "Error in %s (line %d): parameter '%s %s' gain values not in range. (-8...8)\n", filename, line, parameter, value);
+                       return(-1);
+               }
+               interface->tx_gain = atoi(p);
+               interface->rx_gain = atoi(q);
+       } else
+       if (!strcasecmp(value, "pipeline")) {
+               if (*p == 0) {
+                       SPRINT(interface_error, "Error in %s (line %d): parameter '%s %s' expects pipeline string.\n", filename, line, parameter, value);
+                       return(-1);
+               }
+               SCPY(interface->pipeline, p);
+       } else
+       if (!strcasecmp(value, "blowfish")) {
+               unsigned char key[56];
+               int l;
+               
+               if (!!strncmp(p, "0x", 2)) {
+                       SPRINT(interface_error, "Error in %s (line %d): parameter '%s %s' expects blowfish key starting with '0x'.\n", filename, line, parameter, value);
+                       return(-1);
+               }
+               p += 2;
+               l = 0; 
+               while(*p) {
+                       if (l == 56) {
+                               SPRINT(interface_error, "Error in %s (line %d): parameter '%s %s' key too long.\n", filename, line, parameter, value);
+                               return(-1);
+                       }
+                       if (*p >= '0' && *p <= '9')
+                               key[l] = (*p-'0')<<4;
+                       else if (*p >= 'a' && *p <= 'f')
+                               key[l] = (*p-'a'+10)<<4;
+                       else if (*p >= 'A' && *p <= 'F')
+                               key[l] = (*p-'A'+10)<<4;
+                       else {
+                               digout:
+                               SPRINT(interface_error, "Error in %s (line %d): parameter '%s %s' key has digits out of range. (0...9, a...f)\n", filename, line, parameter, value);
+                               return(-1);
+                       }
+                       p++;
+                       if (*p == 0) {
+                               SPRINT(interface_error, "Error in %s (line %d): parameter '%s %s' key must end on an 8 bit boundary (two character boundary).\n", filename, line, parameter, value);
+                               return(-1);
+                       }
+                       if (*p >= '0' && *p <= '9')
+                               key[l] = (*p-'0')<<4;
+                       else if (*p >= 'a' && *p <= 'f')
+                               key[l] = (*p-'a'+10)<<4;
+                       else if (*p >= 'A' && *p <= 'F')
+                               key[l] = (*p-'A'+10)<<4;
+                       else
+                               goto digout;
+                       p++;
+                       l++;
+               }
+               if (l < 4) {
+                       SPRINT(interface_error, "Error in %s (line %d): parameter '%s %s' key must be at least 4 bytes (8 characters).\n", filename, line, parameter, value);
+                       return(-1);
+               }
+               memcpy(interface->bf_key, key, l);
+               interface->bf_len = l;
+       } else {
+               SPRINT(interface_error, "Error in %s (line %d): parameter '%s' has unknown filter '%s'.\n", filename, line, parameter, value);
+               return(-1);
+       }
+       return(0);
+}
+static int inter_dialmax(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;
+       ifport->dialmax = atoi(value);
        return(0);
 }
+static int inter_tones_dir(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;
+       SCPY(ifport->tones_dir, value);
+       return(0);
+}
+static int inter_gsm(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+#ifndef WITH_GSM
+       SPRINT(interface_error, "Error in %s (line %d): GSM not compiled in.\n", filename, line);
+       return(-1);
+#else
+       struct interface_port *ifport;
+       struct interface *searchif;
+
+       /* check gsm */
+       if (!gsm) {
+               SPRINT(interface_error, "Error in %s (line %d): GSM is not activated.\n", filename, line);
+               return(-1);
+       }
+       searchif = interface_newlist;
+       while(searchif) {
+               ifport = searchif->ifport;
+               while(ifport) {
+                       if (ifport->gsm) {
+                               SPRINT(interface_error, "Error in %s (line %d): port '%s' already uses gsm\n", filename, line, value);
+                               return(-1);
+                       }
+                       ifport = ifport->next;
+               }
+               searchif = searchif->next;
+       }
+
+       /* set portname */
+       if (inter_portname(interface, filename, line, (char *)"portname", gsm->conf.interface_lcr))
+               return(-1);
+       /* goto end of chain again to set gsmflag*/
+       ifport = interface->ifport;
+       while(ifport->next)
+               ifport = ifport->next;
+       ifport->gsm = 1;
+       return(0);
 #endif
+}
 
 
 /*
@@ -691,16 +908,20 @@ struct interface_param interface_param[] = {
        { "extension", &inter_extension, "",
        "If keyword is given, calls to interface are handled as internal extensions."},
        {"tones", &inter_tones, "yes | no",
-       "Interface generates tones during call setup and release, or not.\nBy default only NT-mode interfaces generate tones."},
+       "Interface generates tones during call setup and release, or not.\nBy default only NT-mode ports generate tones."},
 
        {"earlyb", &inter_earlyb, "yes | no",
-       "Interface receives and bridges tones during call setup and release, or not.\nBy default only TE-mode interfaces receive tones."},
+       "Interface receives and bridges tones during call setup and release, or not.\nBy default only TE-mode ports receive tones."},
 
        {"hunt", &inter_hunt, "linear | roundrobin",
        "Select the algorithm for selecting port with free channel."},
 
        {"port", &inter_port, "<number>",
+       ""},
+       {"portnum", &inter_portnum, "<number>",
        "Give exactly one port for this interface.\nTo give multiple ports, add more lines with port parameters."},
+       {"portname", &inter_portname, "<name>",
+       "Same as 'portnum', but the name is given instead.\nUse 'isdninfo' to list all available ports and names."},
 
        {"block", &inter_block, "",
        "If keyword is given, calls on this interface are blocked.\n"
@@ -711,12 +932,37 @@ 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"
+       "This is required on interfaces that support both NT-mode and TE-mode.\n"
+       "This parameter must follow a 'port' parameter."},
+
+       {"te-special", &inter_tespecial, "",
+       "The given port uses a modified TE-mode.\n"
+       "All information elements that are allowed Network->User will then be\n"
+       "transmitted User->Network also. This is usefull to pass all informations\n"
+       "between two interconnected LCRs, like 'redirected number' or 'display'.\n"
+       "Note that this is not compliant with ISDN protocol.\n"
+       "This parameter must follow a 'port' parameter."},
+
+       {"layer1hold", &inter_l1hold, "yes | no",
+       "The given port will not release layer 1 after layer 2 is down.\n"
+       "It is required to keep layer 1 of telephones up, to solve activation problems.\n"
+       "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,][<number>][,...][,free][,any][,no]",
+       {"channel-out", &inter_channel_out, "[force,][<number>][,...][,free][,any][,no]",
        "Channel selection list for all outgoing calls to the interface.\n"
        "A free channels is searched in order of appearance.\n"
        "This parameter must follow a 'port' parameter.\n"
@@ -726,30 +972,35 @@ struct interface_param interface_param[] = {
        " any - On outgoing calls, signal 'any channel acceptable'. (see DSS1)\n"
        " no - Signal 'no channel available' aka 'call waiting'. (see DSS1)"},
 
-       {"channel_in", &inter_channel_in, "[force,][<number>][,...][,free][,any][,no]",
-       "Channel selection list for all incomming calls from the interface.\n"
+       {"channel-in", &inter_channel_in, "[<number>][,...][,free]",
+       "Channel selection list for all incoming calls from the interface.\n"
        "A free channels is accepted if in the list.\n"
-       "If no channel was requested, the first free channel found is selected.\n"
+       "If any channel was requested, the first free channel found is selected.\n"
        "This parameter must follow a 'port' parameter.\n"
        " <number>[,...] - List of channels to accept.\n"
        " free - Accept any free channel"},
 
+       {"timeouts", &inter_timeouts, "<setup> <dialing> <proceeding> <alerting> <disconnect>",
+       "Timeout values for call states. They are both for incoming and outgoing states.\n"
+       "The default is 120 seconds for all states. Use 0 to disable.\n"
+       "This parameter must follow a 'port' parameter.\n"},
+
        {"msn", &inter_msn, "<default MSN>,[<additional MSN>[,...]]",
-       "Incomming caller ID is checked against given MSN numbers.\n"
+       "Incoming caller ID is checked against given MSN numbers.\n"
        "If the caller ID is not found in this list, it is overwritten by the first MSN"},
 
-       {"screen-in", &inter_screen_in, "[options] <old caller ID>[%%] [options] <new caller ID>[%%]",
-       "Adds an entry for incomming calls to the caller ID screen list.\n"
+       {"screen-in", &inter_screen_in, "[options] <old caller ID>[%] [options] <new caller ID>[%]",
+       "Adds an entry for incoming calls to the caller ID screen list.\n"
        "If the given 'old caller ID' matches, it is replaced by the 'new caller ID'\n"
-       "If '%%' is given after old caller ID, it matches even if caller ID has\n"
+       "If '%' is given after old caller ID, it matches even if caller ID has\n"
        "additional digits.\n"
-       "If '%%' is given after mew caller ID, additinal digits of the 'old caller ID'\n"
+       "If '%' is given after mew caller ID, additinal digits of the 'old caller ID'\n"
        "are added.\n"
        "Options can be:\n"
        " unknown | subsciber | national | international - Change caller ID type.\n"
        " present | restrict - Change presentation of caller ID."},
                
-       {"screen-out", &inter_screen_out, "<old caller ID> <new caller ID> [options]",
+       {"screen-out", &inter_screen_out, "[options] <old caller ID>[%] [options] <new caller ID>[%]",
        "Adds an entry for outgoing calls to the caller ID screen list.\n"
        "See 'screen-in' for help."},
 
@@ -757,13 +1008,23 @@ struct interface_param interface_param[] = {
        "Disables DTMF detection for this interface.\n"
        "This parameter must follow a 'port' parameter."},
 
-#if 0
-#warning todo: filter, also in the PmISDN object
-       {"filter", &inter_filter, "<filter> [parameters]",
+       {"filter", &inter_filter, "<filter> <parameters>",
        "Adds/appends a filter. Filters are ordered in transmit direction.\n"
        "gain <tx-volume> <rx-volume> - Changes volume (-8 .. 8)\n"
+       "pipeline <string> - Sets echo cancelation pipeline.\n"
        "blowfish <key> - Adds encryption. Key must be 4-56 bytes (8-112 hex characters."},
-#endif
+
+       {"dialmax", &inter_dialmax, "<digits>",
+       "Limits the number of digits in setup/information message."},
+
+       {"tones_dir", &inter_tones_dir, "<path>",
+       "Overrides the given tone_dir in options.conf.\n"
+       "To used kernel tones in mISDN_dsp.ko, say 'american', 'german', or 'oldgerman'."},
+
+       {"gsm", &inter_gsm, "",
+       "Sets up GSM interface for using OpenBSC.\n"
+       "This interface must be a loopback interface. The second loopback interface\n"
+       "must be assigned to OpenBSC"},
 
        {NULL, NULL, NULL, NULL}
 };
@@ -788,29 +1049,23 @@ struct interface *read_interfaces(void)
        struct interface_param  *ifparam;
 
        if (interface_newlist != NULL)
-       {
-               PERROR("software error, list is not empty.\n");
-               exit(-1);
-       }
+               FATAL("list is not empty.\n");
        interface_error[0] = '\0';
-       SPRINT(filename, "%s/interface.conf", INSTALL_DATA);
+       SPRINT(filename, "%s/interface.conf", CONFIG_DATA);
 
-       if (!(fp = fopen(filename,"r")))
-       {
+       if (!(fp = fopen(filename,"r"))) {
                SPRINT(interface_error, "Cannot open '%s'\n", filename);
                goto error;
        }
 
        line=0;
-       while((fgets(buffer,sizeof(buffer),fp)))
-       {
+       while((fgets(buffer,sizeof(buffer),fp))) {
                buffer[sizeof(buffer)-1]=0;
                if (buffer[0]) buffer[strlen(buffer)-1]=0;
                p=buffer;
                line++;
 
-               while(*p <= 32) /* skip spaces */
-               {
+               while(*p <= 32) { /* skip spaces */
                        if (*p == 0)
                                break;
                        p++;
@@ -821,10 +1076,8 @@ struct interface *read_interfaces(void)
                parameter[0]=0;
                value[0]=0;
                i=0; /* read parameter */
-               while(*p > 32)
-               {
-                       if (i+1 >= sizeof(parameter))
-                       {
+               while(*p > 32) {
+                       if (i+1 >= sizeof(parameter)) {
                                SPRINT(interface_error, "Error in %s (line %d): parameter name too long.\n",filename,line);
                                goto error;
                        }
@@ -832,20 +1085,16 @@ struct interface *read_interfaces(void)
                        parameter[i++] = *p++;
                }
 
-               while(*p <= 32) /* skip spaces */
-               {
+               while(*p <= 32) { /* skip spaces */
                        if (*p == 0)
                                break;
                        p++;
                }
 
-               if (*p!=0 && *p!='#') /* missing name */
-               {
+               if (*p!=0 && *p!='#') { /* missing name */
                        i=0; /* read until end */
-                       while(*p!=0 && *p!='#')
-                       {
-                               if (i+1 >= sizeof(value))
-                               {
+                       while(*p!=0 && *p!='#') {
+                               if (i+1 >= sizeof(value)) {
                                        SPRINT(interface_error, "Error in %s (line %d): value too long.\n", filename, line);
                                        goto error;
                                }
@@ -854,8 +1103,7 @@ struct interface *read_interfaces(void)
                        }
 
                        /* remove trailing spaces from value */
-                       while(i)
-                       {
+                       while(i) {
                                if (value[i-1]==0 || value[i-1]>32)
                                        break;
                                value[i-1] = '\0';
@@ -864,18 +1112,15 @@ struct interface *read_interfaces(void)
                }
 
                /* check for interface name as first statement */
-               if (expecting && parameter[0]!='[')
-               {
+               if (expecting && parameter[0]!='[') {
                        SPRINT(interface_error, "Error in %s (line %d): expecting interface name inside [ and ], but got: '%s'.\n", filename, line, parameter);
                        goto error;
                }
                expecting = 0;
 
                /* check for new interface */
-               if (parameter[0] == '[')
-               {
-                       if (parameter[strlen(parameter)-1] != ']')
-                       {
+               if (parameter[0] == '[') {
+                       if (parameter[strlen(parameter)-1] != ']') {
                                SPRINT(interface_error, "Error in %s (line %d): expecting interface name inside [ and ], but got: '%s'.\n", filename, line, parameter);
                                goto error;
                        }
@@ -883,10 +1128,8 @@ struct interface *read_interfaces(void)
 
                        /* check if interface name already exists */
                        interface = interface_newlist;
-                       while(interface)
-                       {
-                               if (!strcasecmp(interface->name, parameter+1))
-                               {
+                       while(interface) {
+                               if (!strcasecmp(interface->name, parameter+1)) {
                                        SPRINT(interface_error, "Error in %s (line %d): interface name '%s' already defined above.\n", filename, line, parameter+1);
                                        goto error;
                                }
@@ -894,14 +1137,8 @@ struct interface *read_interfaces(void)
                        }
 
                        /* append interface to new list */
-                       interface = (struct interface *)malloc(sizeof(struct interface));
-                       if (!interface)
-                       {
-                               SPRINT(interface_error, "No memory!");
-                               goto error;
-                       }
+                       interface = (struct interface *)MALLOC(sizeof(struct interface));
                        memuse++;
-                       memset(interface, 0, sizeof(struct interface));
 
                        /* name interface */
                        SCPY(interface->name, parameter+1);
@@ -914,10 +1151,8 @@ struct interface *read_interfaces(void)
                }
 
                ifparam = interface_param;
-               while(ifparam->name)
-               {
-                       if (!strcasecmp(parameter, ifparam->name))
-                       {
+               while(ifparam->name) {
+                       if (!strcasecmp(parameter, ifparam->name)) {
                                if (ifparam->func(interface, filename, line, parameter, value))
                                        goto error;
                                break;
@@ -952,81 +1187,84 @@ void free_interfaces(struct interface *interface)
        struct select_channel *selchannel;
        struct interface_msn *ifmsn;
        struct interface_screen *ifscreen;
-       struct interface_filter *iffilter;
 
-       while(interface)
-       {
+       while(interface) {
                ifport = interface->ifport;
-               while(ifport)
-               {
+               while(ifport) {
                        selchannel = ifport->in_channel;
-                       while(selchannel)
-                       {
+                       while(selchannel) {
                                temp = selchannel;
                                selchannel = selchannel->next;
-                               memset(temp, 0, sizeof(struct select_channel));
-                               free(temp);
+                               FREE(temp, sizeof(struct select_channel));
                                memuse--;
                        }
                        selchannel = ifport->out_channel;
-                       while(selchannel)
-                       {
+                       while(selchannel) {
                                temp = selchannel;
                                selchannel = selchannel->next;
-                               memset(temp, 0, sizeof(struct select_channel));
-                               free(temp);
+                               FREE(temp, sizeof(struct select_channel));
                                memuse--;
                        }
                        temp = ifport;
                        ifport = ifport->next;
-                       memset(temp, 0, sizeof(struct interface_port));
-                       free(temp);
+                       FREE(temp, sizeof(struct interface_port));
                        memuse--;
                }
                ifmsn = interface->ifmsn;
-               while(ifmsn)
-               {
+               while(ifmsn) {
                        temp = ifmsn;
                        ifmsn = ifmsn->next;
-                       memset(temp, 0, sizeof(struct interface_msn));
-                       free(temp);
+                       FREE(temp, sizeof(struct interface_msn));
                        memuse--;
                }
                ifscreen = interface->ifscreen_in;
-               while(ifscreen)
-               {
+               while(ifscreen) {
                        temp = ifscreen;
                        ifscreen = ifscreen->next;
-                       memset(temp, 0, sizeof(struct interface_screen));
-                       free(temp);
+                       FREE(temp, sizeof(struct interface_screen));
                        memuse--;
                }
                ifscreen = interface->ifscreen_out;
-               while(ifscreen)
-               {
+               while(ifscreen) {
                        temp = ifscreen;
                        ifscreen = ifscreen->next;
-                       memset(temp, 0, sizeof(struct interface_screen));
-                       free(temp);
-                       memuse--;
-               }
-               iffilter = interface->iffilter;
-               while(iffilter)
-               {
-                       temp = iffilter;
-                       iffilter = iffilter->next;
-                       memset(temp, 0, sizeof(struct interface_filter));
-                       free(temp);
+                       FREE(temp, sizeof(struct interface_screen));
                        memuse--;
                }
                temp = interface;
                interface = interface->next;
-               memset(temp, 0, sizeof(struct interface));
-               free(temp);
+               FREE(temp, sizeof(struct interface));
                memuse--;
        }
 }
 
+/*
+ * defaults of ports if not specified by config
+ */
+static void set_defaults(struct interface_port *ifport)
+{
+       /* default channel selection list */
+       if (!ifport->out_channel)
+               default_out_channel(ifport);
+       if (!ifport->in_channel)
+               default_in_channel(ifport);
+       /* default is_tones */
+       if (ifport->interface->is_tones)
+               ifport->mISDNport->tones = (ifport->interface->is_tones==IS_YES);
+       else
+               ifport->mISDNport->tones = (ifport->mISDNport->ntmode)?1:0;
+       /* default is_earlyb */
+       if (ifport->interface->is_earlyb)
+               ifport->mISDNport->earlyb = (ifport->interface->is_earlyb==IS_YES);
+       else
+               ifport->mISDNport->earlyb = (ifport->mISDNport->ntmode)?0:1;
+       /* set locally flag */
+       if (ifport->interface->extension)
+               ifport->mISDNport->locally = 1;
+       else
+               ifport->mISDNport->locally = 0;
+}
+
 
 /*
  * all links between mISDNport and interface are made
@@ -1041,26 +1279,25 @@ void relink_interfaces(void)
 
        /* unlink all mISDNports */
        mISDNport = mISDNport_first;
-       while(mISDNport)
-       {
+       while(mISDNport) {
                mISDNport->ifport = NULL;
                mISDNport = mISDNport->next;
        }
 
        /* relink existing mISDNports */
        interface = interface_newlist;
-       while(interface)
-       {
+       while(interface) {
                ifport = interface->ifport;
-               while(ifport)
-               {
+               while(ifport) {
                        mISDNport = mISDNport_first;
-                       while(mISDNport)
-                       {
-                               if (mISDNport->portnum == ifport->portnum)
-                               {
+                       while(mISDNport) {
+                               if (!strcmp(mISDNport->name, ifport->portname))
+                                       ifport->portnum = mISDNport->portnum; /* same name, so we use same number */
+                               if (mISDNport->portnum == ifport->portnum) {
+                                       PDEBUG(DEBUG_ISDN, "Port %d:%s relinking!\n", mISDNport->portnum);
                                        ifport->mISDNport = mISDNport;
                                        mISDNport->ifport = ifport;
+                                       set_defaults(ifport);
                                }
                                mISDNport = mISDNport->next;
                        }
@@ -1072,10 +1309,8 @@ void relink_interfaces(void)
        /* close unused mISDNports */
        closeagain:
        mISDNport = mISDNport_first;
-       while(mISDNport)
-       {
-               if (mISDNport->ifport == NULL)
-               {
+       while(mISDNport) {
+               if (mISDNport->ifport == NULL) {
                        PDEBUG(DEBUG_ISDN, "Port %d is not used anymore and will be closed\n", mISDNport->portnum);
                        /* remove all port objects and destroy port */
                        mISDNport_close(mISDNport);
@@ -1086,13 +1321,10 @@ void relink_interfaces(void)
 
        /* open and link new mISDNports */
        interface = interface_newlist;
-       while(interface)
-       {
+       while(interface) {
                ifport = interface->ifport;
-               while(ifport)
-               {
-                       if (!ifport->mISDNport)
-                       {
+               while(ifport) {
+                       if (!ifport->mISDNport) {
                                load_port(ifport);
                        }
                        ifport = ifport->next;
@@ -1111,30 +1343,17 @@ void load_port(struct interface_port *ifport)
        struct mISDNport *mISDNport;
 
        /* open new port */
-       mISDNport = mISDNport_open(ifport->portnum, ifport->ptp, ifport->ptmp, ifport->interface);
-       if (mISDNport)
-       {
+       mISDNport = mISDNport_open(ifport->portnum, ifport->portname, ifport->ptp, ifport->nt, ifport->tespecial, ifport->l1hold, ifport->l2hold, ifport->interface, ifport->gsm);
+       if (mISDNport) {
                /* link port */
                ifport->mISDNport = mISDNport;
                mISDNport->ifport = ifport;
-               
-               /* default channel selection list */
-               if (!ifport->out_channel)
-                       default_out_channel(ifport);
-               if (!ifport->in_channel)
-                       default_in_channel(ifport);
-               /* default is_tones */
-               if (ifport->interface->is_tones)
-                       ifport->mISDNport->tones = (ifport->interface->is_tones==IS_YES);
-               else
-                       ifport->mISDNport->tones = (ifport->mISDNport->ntmode)?1:0;
-               /* default is_earlyb */
-               if (ifport->interface->is_earlyb)
-                       ifport->mISDNport->earlyb = (ifport->interface->is_earlyb==IS_YES);
-               else
-                       ifport->mISDNport->earlyb = (ifport->mISDNport->ntmode)?0:1;
-       } else
-       {
+               /* set number and name */
+               ifport->portnum = mISDNport->portnum;
+               SCPY(ifport->portname, mISDNport->name);
+               /* set defaults */
+               set_defaults(ifport);
+       } else {
                ifport->block = 2; /* not available */
        }
 }
@@ -1151,18 +1370,153 @@ void doc_interface(void)
 
        printf("[<name>]\n");
        ifparam = interface_param;
-       while(ifparam->name)
-       {
-               printf("%s %s\n", ifparam->name, ifparam->usage);
+       while(ifparam->name) {
+               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);
+       while(ifparam->name) {
+               if (ifparam->name[0]) {
+                       printf("\nParameter: %s %s\n", ifparam->name, ifparam->usage);
+                       printf("%s\n", ifparam->help);
+               }
                ifparam++;
        }
 }
 
+
+/* screen caller id
+ * out==0: incoming caller id, out==1: outgoing caller id
+ */
+void do_screen(int out, char *id, int idsize, int *type, int *present, struct interface *interface)
+{
+       char                    *msn1;
+       struct interface_msn    *ifmsn;
+       struct interface_screen *ifscreen;
+       char suffix[64];
+
+       /* screen incoming caller id */
+       if (!out) {
+               /* check for MSN numbers, use first MSN if no match */
+               msn1 = NULL;
+               ifmsn = interface->ifmsn;
+               while(ifmsn) {
+                       if (!msn1)
+                               msn1 = ifmsn->msn;
+                       if (!strcmp(ifmsn->msn, id)) {
+                               break;
+                       }
+                       ifmsn = ifmsn->next;
+               }
+               if (ifmsn) {
+                       start_trace(-1, interface, numberrize_callerinfo(id, *type, options.national, options.international), NULL, DIRECTION_IN, 0, 0, "SCREEN (found in MSN list)");
+                       add_trace("msn", NULL, "%s", id);
+                       end_trace();
+               }
+               if (!ifmsn && msn1) { // not in list, first msn given
+                       start_trace(-1, interface, numberrize_callerinfo(id, *type, options.national, options.international), NULL, DIRECTION_IN, 0, 0, "SCREEN (not found in MSN list)");
+                       add_trace("msn", "given", "%s", id);
+                       add_trace("msn", "used", "%s", msn1);
+                       end_trace();
+                       UNCPY(id, msn1, idsize);
+                       id[idsize-1] = '\0';
+               }
+       }
+
+       /* check screen list */
+       if (out)
+               ifscreen = interface->ifscreen_out;
+       else
+               ifscreen = interface->ifscreen_in;
+       while (ifscreen) {
+               if (ifscreen->match_type==-1 || ifscreen->match_type==*type)
+               if (ifscreen->match_present==-1 || ifscreen->match_present==*present) {
+                       if (strchr(ifscreen->match,'%')) {
+                               if (!strncmp(ifscreen->match, id, strchr(ifscreen->match,'%')-ifscreen->match))
+                                       break;
+                       } else {
+                               if (!strcmp(ifscreen->match, id))
+                                       break;
+                       }
+               }
+               ifscreen = ifscreen->next;
+       }
+       if (ifscreen) { // match
+               start_trace(-1, interface, numberrize_callerinfo(id, *type, options.national, options.international), NULL, out?DIRECTION_OUT:DIRECTION_IN, 0, 0, "SCREEN (found in screen list)");
+               switch(*type) {
+                       case INFO_NTYPE_UNKNOWN:
+                       add_trace("given", "type", "unknown");
+                       break;
+                       case INFO_NTYPE_SUBSCRIBER:
+                       add_trace("given", "type", "subscriber");
+                       break;
+                       case INFO_NTYPE_NATIONAL:
+                       add_trace("given", "type", "national");
+                       break;
+                       case INFO_NTYPE_INTERNATIONAL:
+                       add_trace("given", "type", "international");
+                       break;
+               }
+               switch(*present) {
+                       case INFO_PRESENT_ALLOWED:
+                       add_trace("given", "present", "allowed");
+                       break;
+                       case INFO_PRESENT_RESTRICTED:
+                       add_trace("given", "present", "restricted");
+                       break;
+                       case INFO_PRESENT_NOTAVAIL:
+                       add_trace("given", "present", "not available");
+                       break;
+               }
+               add_trace("given", "id", "%s", id[0]?id:"<empty>");
+               if (ifscreen->result_type != -1) {
+                       *type = ifscreen->result_type;
+                       switch(*type) {
+                               case INFO_NTYPE_UNKNOWN:
+                               add_trace("used", "type", "unknown");
+                               break;
+                               case INFO_NTYPE_SUBSCRIBER:
+                               add_trace("used", "type", "subscriber");
+                               break;
+                               case INFO_NTYPE_NATIONAL:
+                               add_trace("used", "type", "national");
+                               break;
+                               case INFO_NTYPE_INTERNATIONAL:
+                               add_trace("used", "type", "international");
+                               break;
+                       }
+               }
+               if (ifscreen->result_present != -1) {
+                       *present = ifscreen->result_present;
+                       switch(*present) {
+                               case INFO_PRESENT_ALLOWED:
+                               add_trace("used", "present", "allowed");
+                               break;
+                               case INFO_PRESENT_RESTRICTED:
+                               add_trace("used", "present", "restricted");
+                               break;
+                               case INFO_PRESENT_NOTAVAIL:
+                               add_trace("used", "present", "not available");
+                               break;
+                       }
+               }
+               if (strchr(ifscreen->match,'%')) {
+                       SCPY(suffix, strchr(ifscreen->match,'%') - ifscreen->match + id);
+                       UNCPY(id, ifscreen->result, idsize);
+                       id[idsize-1] = '\0';
+                       if (strchr(id,'%')) {
+                               *strchr(id,'%') = '\0';
+                               UNCAT(id, suffix, idsize);
+                               id[idsize-1] = '\0';
+                       }
+               } else {
+                       UNCPY(id, ifscreen->result, idsize);
+                       id[idsize-1] = '\0';
+               }
+               add_trace("used", "id", "%s", id[0]?id:"<empty>");
+               end_trace();
+       }
+}
+