modified: Makefile.am
modified: Makefile.in
modified: README
modified: bchannel.c
modified: dss1.cpp
modified: mISDN.cpp
modified: main.h
$(INSTALL) chan_lcr.so $(astmoddir)
endif
$(INSTALL) chan_lcr.so $(astmoddir)
endif
-INCLUDES = $(all_includes) $(GSM_INCLUDE) $(SS5_INCLUDE) -Wall -I/usr/include/mISDNuser $(INSTALLATION_DEFINES)
+INCLUDES = $(all_includes) $(GSM_INCLUDE) $(SS5_INCLUDE) -Wall $(INSTALLATION_DEFINES)
lcr_SOURCES = $(GSM_SOURCE) $(SS5_SOURCE) select.c action.cpp mISDN.cpp tones.c \
action_efi.cpp crypt.cpp mail.c trace.c \
lcr_SOURCES = $(GSM_SOURCE) $(SS5_SOURCE) select.c action.cpp mISDN.cpp tones.c \
action_efi.cpp crypt.cpp mail.c trace.c \
@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_SOURCES =
@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_LDFLAGS = -shared
@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_LDADD = chan_lcr.po bchannel.po options.po callerid.po select.po
@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_SOURCES =
@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_LDFLAGS = -shared
@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_LDADD = chan_lcr.po bchannel.po options.po callerid.po select.po
-INCLUDES = $(all_includes) $(GSM_INCLUDE) $(SS5_INCLUDE) -Wall -I/usr/include/mISDNuser $(INSTALLATION_DEFINES)
+INCLUDES = $(all_includes) $(GSM_INCLUDE) $(SS5_INCLUDE) -Wall $(INSTALLATION_DEFINES)
lcr_SOURCES = $(GSM_SOURCE) $(SS5_SOURCE) select.c action.cpp mISDN.cpp tones.c \
action_efi.cpp crypt.cpp mail.c trace.c \
action_vbox.cpp dss1.cpp main.c \
lcr_SOURCES = $(GSM_SOURCE) $(SS5_SOURCE) select.c action.cpp mISDN.cpp tones.c \
action_efi.cpp crypt.cpp mail.c trace.c \
action_vbox.cpp dss1.cpp main.c \
- Fixed HLC (higher layer capability) modification to LCR routing.
- Fixed chan_lcr fax queue buffer. Added LCR_TRANSFERCAPABILITY environment.
- Fixed compiler warnings when compiling with gcc 4.3.4.
- Fixed HLC (higher layer capability) modification to LCR routing.
- Fixed chan_lcr fax queue buffer. Added LCR_TRANSFERCAPABILITY environment.
- Fixed compiler warnings when compiling with gcc 4.3.4.
+- Fixed includes to latest mISDNuser structures.
#include <sys/socket.h>
#include <mISDNif.h>
#include <sys/socket.h>
#include <mISDNif.h>
-#define AF_COMPATIBILITY_FUNC 1
-#define MISDN_OLD_AF_COMPATIBILITY 1
-#include <compat_af_isdn.h>
+#include <mISDN/mISDNcompat.h>
+int __af_isdn = MISDN_AF_ISDN;
+#include <mISDN/q931.h>
#define HAVE_ATTRIBUTE_always_inline 1
#define HAVE_ARPA_INET_H 1
#define HAVE_ATTRIBUTE_always_inline 1
#define HAVE_ARPA_INET_H 1
int bchannel_initialize(void)
{
int bchannel_initialize(void)
{
//#include <sys/socket.h>
extern "C" {
}
//#include <sys/socket.h>
extern "C" {
}
extern unsigned int mt_assign_pid;
#include "ie.cpp"
extern unsigned int mt_assign_pid;
#include "ie.cpp"
#include "main.h"
#include "myisdn.h"
#include "main.h"
#include "myisdn.h"
-extern "C" {
-#define MISDN_OLD_AF_COMPATIBILITY 1
-#include <compat_af_isdn.h>
-}
-#include <q931.h>
+#include <mISDN/mISDNcompat.h>
+int __af_isdn = MISDN_AF_ISDN;
+#include <mISDN/q931.h>
#undef offsetof
#ifdef __compiler_offsetof
#undef offsetof
#ifdef __compiler_offsetof
/* try to open raw socket to check kernel */
mISDNsocket = socket(PF_ISDN, SOCK_RAW, ISDN_P_BASE);
if (mISDNsocket < 0) {
/* try to open raw socket to check kernel */
mISDNsocket = socket(PF_ISDN, SOCK_RAW, ISDN_P_BASE);
if (mISDNsocket < 0) {
- fprintf(stderr, "Cannot open mISDN due to '%s'. (Does your Kernel support socket based mISDN?)\n", strerror(errno));
+ fprintf(stderr, "Cannot open mISDN due to '%s'. (Does your Kernel support socket based mISDN? Protocol family is %d.)\n", strerror(errno), PF_ISDN);
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
+#include <mISDN/mbuffer.h>
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif