ifport = ifport->next;
}
- /* check for port already assigned, but not for shared gsm interface */
+ /* check for port already assigned, but not for shared loop interface */
searchif = interface_newlist;
-#if defined WITH_GSM_BS || defined WITH_GSM_MS
- if (options.gsm && !strcmp(value, gsm->conf.interface_lcr))
-#endif
+ if (!!strcmp(value, options.loopback_lcr))
{
while(searchif) {
ifport = searchif->ifport;
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;
#else
struct interface_port *ifport, *searchifport;
struct interface *searchif;
- char *element;
-
- /* check gsm */
- if (!gsm) {
- SPRINT(interface_error, "Error in %s (line %d): GSM is not activated.\n", filename, line);
- return(-1);
- }
/* set portname */
if (inter_portname(interface, filename, line, (char *)"portname", options.loopback_lcr))
ifport->gsm_ms = 1;
/* copy values */
- element = strsep(&value, " ");
- if (!element || !element[0]) {
+ if (!value || !value[0]) {
SPRINT(interface_error, "Error in %s (line %d): Missing MS name and socket name.\n", filename, line);
return(-1);
}
- SCPY(ifport->gsm_ms_name, element);
- element = strsep(&value, " ");
- if (!element || !element[0]) {
- SPRINT(interface_error, "Error in %s (line %d): Missing socket name after MS name.\n", filename, line);
- return(-1);
- }
- SCPY(ifport->gsm_ms_socket, element);
+ SCPY(ifport->gsm_ms_name, value);
- /* check if socket is used multiple times */
+ /* check if name is used multiple times */
searchif = interface_newlist;
while(searchif) {
searchifport = searchif->ifport;
while(searchifport) {
if (searchifport != ifport
- && !strcmp(searchifport->gsm_ms_socket, ifport->gsm_ms_socket)) {
- SPRINT(interface_error, "Error in %s (line %d): mobile '%s' already uses the given socket '%s', choose a different one.\n", filename, line, ifport->gsm_ms_name, searchifport->gsm_ms_socket);
+ && !strcmp(searchifport->gsm_ms_name, ifport->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, ifport->gsm_ms_name, searchifport->gsm_ms_name);
return(-1);
}
searchifport = searchifport->next;
/* unlink all mISDNports */
mISDNport = mISDNport_first;
while(mISDNport) {
+ if (mISDNport->ifport) {
+ ifport = mISDNport->ifport;
+#ifdef WITH_GSM_MS
+ if (ifport->gsm_ms)
+ gsm_ms_delete(ifport->gsm_ms_name);
+#endif
+#ifdef WITH_GSM_BS
+ if (ifport->gsm_bs)
+ gsm_bs_exit(0);
+#endif
+ }
mISDNport->ifport = NULL;
mISDNport = mISDNport->next;
}
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 */
-#ifdef WITH_GSM_MS
- if (ifport->gsm_ms)
- gsm_ms_delete(ifport->gsm_ms_name);
-#endif
+ /* destroy port */
mISDNport_close(mISDNport);
goto closeagain;
}
mISDNport_static(mISDNport);
#ifdef WITH_GSM_MS
if (ifport->gsm_ms)
- gsm_ms_new(ifport->gsm_ms_name, ifport->gsm_ms_socket);
+ gsm_ms_new(ifport->gsm_ms_name);
+#endif
+#ifdef WITH_GSM_BS
+ if (ifport->gsm_bs)
+ gsm_bs_init();
#endif
} else {
ifport->block = 2; /* not available */