return(-1);
#else
struct interface_port *ifport, **ifportp;
- struct interface *searchif;
/* goto end of chain */
ifport = interface->ifport;
ifport = ifport->next;
}
- /* check for port already assigned, but not for shared loop interface */
- searchif = interface_newlist;
- if (!!strcmp(value, options.loopback_lcr))
- {
- 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);
- }
- ifport = ifport->next;
- }
- searchif = searchif->next;
- }
- }
/* alloc port substructure */
ifport = (struct interface_port *)MALLOC(sizeof(struct interface_port));
memuse++;
ifport->nodtmf = 1;
return(0);
}
+static int inter_dtmf_threshold(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->dtmf_threshold = atoi(value);
+ return(0);
+}
static int inter_filter(struct interface *interface, char *filename, int line, char *parameter, char *value)
{
char *p, *q;
/* check if name is used multiple times */
searchif = interface_newlist;
while(searchif) {
- if (!strcmp(searchif->gsm_ms_name, interface->gsm_ms_name)) {
+ if (searchif != interface && !strcmp(searchif->gsm_ms_name, interface->gsm_ms_name)) {
SPRINT(interface_error, "Error in %s (line %d): mobile '%s' already uses the given MS name '%s', choose a different one.\n", filename, line, interface->gsm_ms_name, searchif->gsm_ms_name);
return(-1);
}
SPRINT(interface_error, "Error in %s (line %d): Missing SIP remote IP.\n", filename, line);
return(-1);
}
- SCPY(interface->sip_local_ip, value);
- SCPY(interface->sip_remote_ip, p);
+ SCPY(interface->sip_local_peer, value);
+ SCPY(interface->sip_remote_peer, p);
return(0);
#endif
}
static int inter_rtp_bridge(struct interface *interface, char *filename, int line, char *parameter, char *value)
{
+ int supported = 0;
+
+#ifdef WITH_GSM_BS
+ if (interface->gsm_bs)
+ supported = 1;
+#endif
+#ifdef WITH_SIP
+ if (interface->sip)
+ supported = 1;
+#endif
+ if (!supported) {
+ SPRINT(interface_error, "Error in %s (line %d): Interface does not support RTP\n", filename, line);
+ return(-1);
+ }
interface->rtp_bridge = 1;
return(0);
}
+#if 0
+static int inter_rtp_payload(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+#ifndef WITH_GSM_BS
+ SPRINT(interface_error, "Error in %s (line %d): GSM BS side not compiled in.\n", filename, line);
+ return(-1);
+#else
+ if (!interface->gsm_bs) {
+ SPRINT(interface_error, "Error in %s (line %d): This parameter only works for GSM BS side interface\n", filename, line);
+ return(-1);
+ }
+ if (!interface->rtp_bridge) {
+ SPRINT(interface_error, "Error in %s (line %d): This parameter only works here, if RTP bridging is enabled\n", filename, line);
+ return(-1);
+ }
+ if (!value[0]) {
+ SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects one payload type\n", filename, line, parameter);
+ return(-1);
+ }
+ if (interface->gsm_bs_payloads == sizeof(interface->gsm_bs_payload_types)) {
+ SPRINT(interface_error, "Error in %s (line %d): Too many payload types defined\n", filename, line);
+ return(-1);
+ }
+ interface->gsm_bs_payload_types[interface->gsm_bs_payloads++] = atoi(value);
+
+ return(0);
+#endif
+}
+#endif
static int inter_nonotify(struct interface *interface, char *filename, int line, char *parameter, char *value)
{
struct interface_port *ifport;
#endif
static int inter_remote(struct interface *interface, char *filename, int line, char *parameter, char *value)
{
- struct interface_port *ifport;
struct interface *searchif;
if (!value[0]) {
}
searchif = interface_newlist;
while(searchif) {
- ifport = searchif->ifport;
- while(ifport) {
- if (ifport->remote && !strcmp(ifport->remote_app, value)) {
- SPRINT(interface_error, "Error in %s (line %d): port '%s' already uses remote application '%s'.\n", filename, line, ifport->portname, value);
- return(-1);
- }
- ifport = ifport->next;
+ if (interface->remote && !strcmp(interface->remote_app, value)) {
+ SPRINT(interface_error, "Error in %s (line %d): interface '%s' already uses remote application '%s'.\n", filename, line, interface->name, value);
+ return(-1);
}
searchif = searchif->next;
}
- /* set portname */
- if (inter_portname(interface, filename, line, (char *)"portname", options.loopback_lcr))
+ /* goto end of chain again to set application name */
+ interface->remote = 1;
+ SCPY(interface->remote_app, value);
+
+ return(0);
+}
+static int inter_context(struct interface *interface, char *filename, int line, char *parameter, char *value)
+{
+ if (!value[0]) {
+ SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects application context as value.\n", filename, line, parameter);
+ return(-1);
+ }
+ SCPY(interface->remote_context, value);
+
+ return(0);
+}
+static int inter_pots_flash(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;
- /* goto end of chain again to set application name */
+ ifport->pots_flash = 1;
+ return(0);
+}
+static int inter_pots_ring(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->remote = 1;
- SCPY(ifport->remote_app, value);
+ ifport->pots_ring = 1;
+ return(0);
+}
+static int inter_pots_transfer(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->pots_transfer = 1;
return(0);
}
static int inter_shutdown(struct interface *interface, char *filename, int line, char *parameter, char *value)
"Disables DTMF detection for this interface.\n"
"This parameter must follow a 'port' parameter."},
+ {"dtmf-threshold", &inter_dtmf_threshold, "",
+ "Set threshold value for minimum DTMF tone level.\n"
+ "This parameter must follow a 'port' parameter."},
+
{"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"
"Sets up SIP interface that represents one SIP endpoint.\n"
"Give SIP configuration file."},
{"rtp-bridge", &inter_rtp_bridge, "",
- "Sets up SIP interface that represents one SIP endpoint.\n"
- "Give SIP configuration file."},
+ "Enables RTP bridging directly from this interface.\n"
+ "This only works, if both ends support RTP. (like gsm-bs and sip)"},
+#if 0
+ not needed, since ms defines what is supports and remote (sip) tells what is selected
+ {"rtp-payload", &inter_rtp_payload, "<codec>",
+ "Define RTP payload to use. Only valid in conjuntion with gsm-bs!\n"
+ "If multiple payloads are defined, the first has highest priority.\n"
+ "If none are defined, GSM fullrate V1 (type 3) is assumed.\n"},
+#endif
{"nonotify", &inter_nonotify, "",
"Prevents sending notify messages to this interface. A call placed on hold will\n"
"Not affect the remote end (phone or telcom switch).\n"
{"remote", &inter_remote, "<application>",
"Sets up an interface that communicates with the remote application.\n"
"Use \"asterisk\" to use chan_lcr as remote application."},
+ {"context", &inter_context, "<context>",
+ "Give context for calls to application."},
+
+ {"pots-flash", &inter_pots_flash, "",
+ "Allow flash button to hold an active call and setup a new call.\n"
+ "Ihis parameter only appies to POTS type of interfaces\n"
+ "This parameter must follow a 'port' parameter.\n"},
+ {"pots-ring-after-hangup", &inter_pots_ring, "",
+ "Allow ringing of last hold call after hangup. Other calls on hold will not be\n"
+ "released.\n"
+ "Ihis parameter only appies to POTS type of interfaces\n"
+ "This parameter must follow a 'port' parameter.\n"},
+ {"pots-transfer-after-hangup", &inter_pots_transfer, "",
+ "If two calls on hold, both are connected after hangup.\n"
+ "If one call is on hold and another one alerting, call on hold is tranfered.\n"
+ "Ihis parameter only appies to POTS type of interfaces\n"
+ "This parameter must follow a 'port' parameter.\n"},
{"shutdown", &inter_shutdown, "",
"Interface will not be loaded when processing interface.conf"},
struct mISDNport *mISDNport;
struct interface_port *ifport;
#endif
- struct interface *interface, *temp;
- int found;
+ struct interface *interface, *temp, *found;
interface = interface_first;
while(interface) {
- found = 0;
+ found = NULL;
temp = interface_newlist;
while(temp) {
if (!strcmp(temp->name, interface->name))
- found = 1;
+ found = temp;
temp = temp->next;
}
if (!found) {
if (interface->sip)
sip_exit_inst(interface);
#endif
+ } else {
+#ifdef WITH_SIP
+ if (interface->sip) {
+ /* move sip instance, if we keep interface */
+ found->sip_inst = interface->sip_inst;
+ interface->sip_inst = NULL;
+ }
+#endif
+ ;
}
interface = interface->next;
}
interface = interface_newlist;
while(interface) {
- found = 0;
+ found = NULL;
temp = interface_first;
while(temp) {
if (!strcmp(temp->name, interface->name))
- found = 1;
+ found = temp;
temp = temp->next;
}
if (!found) {
projects / lcr.git / blobdiff