X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm.cpp;h=961c11f275a24b5751769745919f3abd4a87d0e8;hp=b2bdd6b4fafa48494b0cb51bf8a2a0705d30df48;hb=b33d7b898dce4721b875c200513c493801d13b6a;hpb=0c65074b5b88b2da2390078d0fab6c72f228709d

diff --git a/gsm.cpp b/gsm.cpp
index b2bdd6b..961c11f 100644
--- a/gsm.cpp
+++ b/gsm.cpp
@@ -44,12 +44,9 @@ static struct timer_list db_sync_timer;
 
 #include "gsm_audio.h"
 
-#undef AF_ISDN
-#undef PF_ISDN
-extern  int     AF_ISDN;
-#define PF_ISDN AF_ISDN
 }
 
+#include <mISDN/mISDNcompat.h>
 
 struct lcr_gsm *gsm = NULL;
 
@@ -249,7 +246,7 @@ void Pgsm::bchannel_send(unsigned int prim, unsigned int id, unsigned char *data
 	memcpy(buf+MISDN_HEADER_LEN, data, len);
 	ret = sendto(p_m_g_gsm_b_sock, buf, MISDN_HEADER_LEN+len, 0, NULL, 0);
 	if (ret <= 0)
-		PERROR("Failed to send to socket index %d\n", index);
+		PERROR("Failed to send to socket index %d\n", p_m_g_gsm_b_index);
 }
 
 void Pgsm::frame_send(void *_frame)
@@ -1607,6 +1604,8 @@ int gsm_init(void)
 	char hlr[128], cfg[128], filename[128];
         mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
 	int pcapfd, rc;
+	char conf_error[128] = "";
+
 
 	debug_init();
 	tall_bsc_ctx = talloc_named_const(NULL, 1, "openbsc");
@@ -1632,8 +1631,8 @@ int gsm_init(void)
 	gsm->gsm_sock = -1;
 
 	/* parse options */
-	if (!gsm_conf(&gsm->conf)) {
-		PERROR("%s", gsm_conf_error);
+	if (!gsm_conf(&gsm->conf, conf_error)) {
+		PERROR("%s", conf_error);
 		return gsm_exit(-EINVAL);
 	}