Merge branch 'socket' of /net/pingi5/home/kkeil/git/mISDNuser into karsten
This commit is contained in:
Karsten Keil
commit
518db74dea
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.68 for mISDNuser 2.0.2.
|
||||
# Generated by GNU Autoconf 2.68 for mISDNuser 2.0.5.
|
||||
#
|
||||
# Report bugs to <i4ldeveloper@isdn4linux.de>.
|
||||
#
|
||||
|
|
@ -709,8 +709,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='mISDNuser'
|
||||
PACKAGE_TARNAME='misdnuser'
|
||||
PACKAGE_VERSION='2.0.2'
|
||||
PACKAGE_STRING='mISDNuser 2.0.2'
|
||||
PACKAGE_VERSION='2.0.5'
|
||||
PACKAGE_STRING='mISDNuser 2.0.5'
|
||||
PACKAGE_BUGREPORT='i4ldeveloper@isdn4linux.de'
|
||||
PACKAGE_URL=''
|
||||
|
||||
|
|
@ -1450,7 +1450,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures mISDNuser 2.0.2 to adapt to many kinds of systems.
|
||||
\`configure' configures mISDNuser 2.0.5 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1520,7 +1520,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of mISDNuser 2.0.2:";;
|
||||
short | recursive ) echo "Configuration of mISDNuser 2.0.5:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1628,7 +1628,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
mISDNuser configure 2.0.2
|
||||
mISDNuser configure 2.0.5
|
||||
generated by GNU Autoconf 2.68
|
||||
|
||||
Copyright (C) 2010 Free Software Foundation, Inc.
|
||||
|
|
@ -2424,7 +2424,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by mISDNuser $as_me 2.0.2, which was
|
||||
It was created by mISDNuser $as_me 2.0.5, which was
|
||||
generated by GNU Autoconf 2.68. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -3244,7 +3244,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='misdnuser'
|
||||
VERSION='2.0.2'
|
||||
VERSION='2.0.5'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -16011,7 +16011,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by mISDNuser $as_me 2.0.2, which was
|
||||
This file was extended by mISDNuser $as_me 2.0.5, which was
|
||||
generated by GNU Autoconf 2.68. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -16077,7 +16077,7 @@ _ACEOF
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
mISDNuser config.status 2.0.2
|
||||
mISDNuser config.status 2.0.5
|
||||
configured by $0, generated by GNU Autoconf 2.68,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ([2.63])
|
||||
AC_INIT([mISDNuser], [2.0.2], [i4ldeveloper@isdn4linux.de])
|
||||
AC_INIT([mISDNuser], [2.0.5], [i4ldeveloper@isdn4linux.de])
|
||||
AC_CONFIG_SRCDIR([tools/])
|
||||
AC_CONFIG_HEADERS([include/config.h])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
|
|
|||
|
|
@ -66,6 +66,9 @@ char *pname;
|
|||
fprintf(stderr," 10 set loop back D permanent\n");
|
||||
fprintf(stderr," 11 clear all loopbacks\n");
|
||||
fprintf(stderr," 12 L1 Timer3 value to given -n value (allowed values 5-30)\n");
|
||||
fprintf(stderr," 13 L1 Test AIS set)\n");
|
||||
fprintf(stderr," 14 L1 Test AIS cleared)\n");
|
||||
fprintf(stderr," 15 L1 Test set state machine to given -n value (allowed values 0-7, 7 - auto state enabled)\n");
|
||||
fprintf(stderr," -n <phone nr> Phonenumber to dial or on -F12 T3 value\n");
|
||||
fprintf(stderr," -vn Printing debug info level n\n");
|
||||
fprintf(stderr,"\n");
|
||||
|
|
@ -80,6 +83,7 @@ typedef struct _devinfo {
|
|||
int bchan;
|
||||
struct sockaddr_mISDN baddr;
|
||||
int nds;
|
||||
int dproto;
|
||||
int bproto;
|
||||
int used_bchannel;
|
||||
int save;
|
||||
|
|
@ -701,7 +705,7 @@ int do_connection(devinfo_t *di) {
|
|||
|
||||
if (di->setloopback)
|
||||
return 0;
|
||||
if (di->func == 12)
|
||||
if (di->func > 12)
|
||||
return 0;
|
||||
hh = (struct mISDNhead *)buf;
|
||||
if (strlen(di->phonenr)) {
|
||||
|
|
@ -875,6 +879,7 @@ int do_setup(devinfo_t *di) {
|
|||
unsigned char buffer[300];
|
||||
struct mISDN_ctrl_req creq;
|
||||
|
||||
di->dproto = ISDN_P_LAPD_TE;
|
||||
switch (di->func) {
|
||||
case 0:
|
||||
case 5:
|
||||
|
|
@ -914,6 +919,10 @@ int do_setup(devinfo_t *di) {
|
|||
di->setloopback = di->func - 7;
|
||||
break;
|
||||
case 12:
|
||||
case 13:
|
||||
case 14:
|
||||
case 15:
|
||||
di->dproto = ISDN_P_LAPD_NT;
|
||||
break;
|
||||
default:
|
||||
fprintf(stdout,"unknown program function %d\n",
|
||||
|
|
@ -950,7 +959,7 @@ int do_setup(devinfo_t *di) {
|
|||
|
||||
close(sk);
|
||||
|
||||
di->layer2 = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_LAPD_TE);
|
||||
di->layer2 = socket(PF_ISDN, SOCK_DGRAM, di->dproto);
|
||||
if (di->layer2 < 0) {
|
||||
fprintf(stdout, "could not open layer2 socket %s\n", strerror(errno));
|
||||
return 5;
|
||||
|
|
@ -1026,6 +1035,43 @@ int do_setup(devinfo_t *di) {
|
|||
close(di->layer2);
|
||||
return ret;
|
||||
}
|
||||
if (di->func == 13) {
|
||||
creq.op = MISDN_CTRL_L1_AIS_TEST;
|
||||
creq.channel = 0;
|
||||
creq.p1 = 1;
|
||||
ret = ioctl(di->layer2, IMCTRLREQ, &creq);
|
||||
if (ret < 0)
|
||||
fprintf(stdout,"AIS ioctl error %s\n", strerror(errno));
|
||||
else
|
||||
fprintf(stdout,"AIS ioctl enable successful\n");
|
||||
close(di->layer2);
|
||||
return ret;
|
||||
}
|
||||
if (di->func == 14) {
|
||||
creq.op = MISDN_CTRL_L1_AIS_TEST;
|
||||
creq.channel = 0;
|
||||
creq.p1 = 0;
|
||||
ret = ioctl(di->layer2, IMCTRLREQ, &creq);
|
||||
if (ret < 0)
|
||||
fprintf(stdout,"AIS ioctl error %s\n", strerror(errno));
|
||||
else
|
||||
fprintf(stdout,"AIS ioctl disable successful\n");
|
||||
close(di->layer2);
|
||||
return ret;
|
||||
}
|
||||
if (di->func == 15) {
|
||||
creq.op = MISDN_CTRL_L1_STATE_TEST;
|
||||
creq.channel = 0;
|
||||
creq.p1 = atol(di->phonenr);
|
||||
ret = ioctl(di->layer2, IMCTRLREQ, &creq);
|
||||
if (ret < 0)
|
||||
fprintf(stdout,"L1 state set ioctl error %s\n", strerror(errno));
|
||||
else
|
||||
fprintf(stdout,"L1 set state(%ld) ioctl successful\n", atol(di->phonenr));
|
||||
close(di->layer2);
|
||||
return ret;
|
||||
}
|
||||
|
||||
hh = (struct mISDNhead *)buffer;
|
||||
|
||||
while (1) {
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
*/
|
||||
#define MISDN_MAJOR_VERSION 1
|
||||
#define MISDN_MINOR_VERSION 1
|
||||
#define MISDN_RELEASE 27
|
||||
#define MISDN_RELEASE 29
|
||||
|
||||
/* primitives for information exchange
|
||||
* generell format
|
||||
|
|
@ -362,31 +362,36 @@ clear_channelmap(u_int nr, u_char *map)
|
|||
}
|
||||
|
||||
/* CONTROL_CHANNEL parameters */
|
||||
#define MISDN_CTRL_GETOP 0x0000
|
||||
#define MISDN_CTRL_LOOP 0x0001
|
||||
#define MISDN_CTRL_CONNECT 0x0002
|
||||
#define MISDN_CTRL_DISCONNECT 0x0004
|
||||
#define MISDN_CTRL_GET_PCM_SLOTS 0x0010
|
||||
#define MISDN_CTRL_SET_PCM_SLOTS 0x0020
|
||||
#define MISDN_CTRL_SETPEER 0x0040
|
||||
#define MISDN_CTRL_UNSETPEER 0x0080
|
||||
#define MISDN_CTRL_RX_OFF 0x0100
|
||||
#define MISDN_CTRL_FILL_EMPTY 0x0200
|
||||
#define MISDN_CTRL_GETPEER 0x0400
|
||||
#define MISDN_CTRL_L1_TIMER3 0x0800
|
||||
#define MISDN_CTRL_HW_FEATURES_OP 0x2000
|
||||
#define MISDN_CTRL_HW_FEATURES 0x2001
|
||||
#define MISDN_CTRL_HFC_OP 0x4000
|
||||
#define MISDN_CTRL_HFC_PCM_CONN 0x4001
|
||||
#define MISDN_CTRL_HFC_PCM_DISC 0x4002
|
||||
#define MISDN_CTRL_HFC_CONF_JOIN 0x4003
|
||||
#define MISDN_CTRL_HFC_CONF_SPLIT 0x4004
|
||||
#define MISDN_CTRL_HFC_RECEIVE_OFF 0x4005
|
||||
#define MISDN_CTRL_HFC_RECEIVE_ON 0x4006
|
||||
#define MISDN_CTRL_HFC_ECHOCAN_ON 0x4007
|
||||
#define MISDN_CTRL_HFC_ECHOCAN_OFF 0x4008
|
||||
#define MISDN_CTRL_HFC_WD_INIT 0x4009
|
||||
#define MISDN_CTRL_HFC_WD_RESET 0x400A
|
||||
#define MISDN_CTRL_GETOP 0x00000000
|
||||
#define MISDN_CTRL_LOOP 0x00000001
|
||||
#define MISDN_CTRL_CONNECT 0x00000002
|
||||
#define MISDN_CTRL_DISCONNECT 0x00000004
|
||||
#define MISDN_CTRL_GET_PCM_SLOTS 0x00000010
|
||||
#define MISDN_CTRL_SET_PCM_SLOTS 0x00000020
|
||||
#define MISDN_CTRL_SETPEER 0x00000040
|
||||
#define MISDN_CTRL_UNSETPEER 0x00000080
|
||||
#define MISDN_CTRL_RX_OFF 0x00000100
|
||||
#define MISDN_CTRL_FILL_EMPTY 0x00000200
|
||||
#define MISDN_CTRL_GETPEER 0x00000400
|
||||
#define MISDN_CTRL_L1_TIMER3 0x00000800
|
||||
#define MISDN_CTRL_HW_FEATURES_OP 0x00002000
|
||||
#define MISDN_CTRL_HW_FEATURES 0x00002001
|
||||
#define MISDN_CTRL_HFC_OP 0x00004000
|
||||
#define MISDN_CTRL_HFC_PCM_CONN 0x00004001
|
||||
#define MISDN_CTRL_HFC_PCM_DISC 0x00004002
|
||||
#define MISDN_CTRL_HFC_CONF_JOIN 0x00004003
|
||||
#define MISDN_CTRL_HFC_CONF_SPLIT 0x00004004
|
||||
#define MISDN_CTRL_HFC_RECEIVE_OFF 0x00004005
|
||||
#define MISDN_CTRL_HFC_RECEIVE_ON 0x00004006
|
||||
#define MISDN_CTRL_HFC_ECHOCAN_ON 0x00004007
|
||||
#define MISDN_CTRL_HFC_ECHOCAN_OFF 0x00004008
|
||||
#define MISDN_CTRL_HFC_WD_INIT 0x00004009
|
||||
#define MISDN_CTRL_HFC_WD_RESET 0x0000400A
|
||||
#define MISDN_CTRL_L1_TESTS 0x00010000
|
||||
#define MISDN_CTRL_L1_STATE_TEST 0x00010001
|
||||
#define MISDN_CTRL_L1_AIS_TEST 0x00010002
|
||||
#define MISDN_CTRL_L1_TS0_MODE 0x00010003
|
||||
#define MISDN_CTRL_L1_GET_SYNC_INFO 0x00010004
|
||||
|
||||
/* special PCM slot numbers */
|
||||
#define MISDN_PCM_SLOT_DISABLE -1 /* PCM disabled */
|
||||
|
|
|
|||
|
|
@ -258,6 +258,7 @@ int ParseAOCEChargingUnitInfo(struct asn1_parm *pc, u_char * p, u_char * end, st
|
|||
|
||||
XSEQUENCE_1(ParseAOCEChargingUnitInfoChoice, ASN1_NOT_TAGGED, ASN1_NOT_TAGGED, chu);
|
||||
XSEQUENCE_OPT_1(ParseChargingAssociation, ASN1_NOT_TAGGED, ASN1_NOT_TAGGED, &chu->chargeAssoc);
|
||||
return p - beg;
|
||||
}
|
||||
|
||||
// AOCEBillingId
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,11 +1,12 @@
|
|||
bin_PROGRAMS = misdn_info misdn_log
|
||||
bin_PROGRAMS = misdn_info misdn_log misdn_E1test
|
||||
sbin_PROGRAMS = misdn_rename misdn_cleanl2
|
||||
|
||||
misdn_info_SOURCES = info.c
|
||||
misdn_log_SOURCES = loghex.c
|
||||
misdn_rename_SOURCES = rename.c
|
||||
misdn_cleanl2_SOURCES = cleanl2.c
|
||||
misdn_E1test_SOURCES = E1test.c
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
AM_CPPFLAGS = -Wall -I$(top_srcdir)/include
|
||||
|
||||
CLEANFILES = *~
|
||||
|
|
|
|||
|
|
@ -34,7 +34,8 @@ PRE_UNINSTALL = :
|
|||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
bin_PROGRAMS = misdn_info$(EXEEXT) misdn_log$(EXEEXT)
|
||||
bin_PROGRAMS = misdn_info$(EXEEXT) misdn_log$(EXEEXT) \
|
||||
misdn_E1test$(EXEEXT)
|
||||
sbin_PROGRAMS = misdn_rename$(EXEEXT) misdn_cleanl2$(EXEEXT)
|
||||
subdir = tools
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
|
|
@ -49,6 +50,9 @@ CONFIG_CLEAN_FILES =
|
|||
CONFIG_CLEAN_VPATH_FILES =
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
|
||||
PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
|
||||
am_misdn_E1test_OBJECTS = E1test.$(OBJEXT)
|
||||
misdn_E1test_OBJECTS = $(am_misdn_E1test_OBJECTS)
|
||||
misdn_E1test_LDADD = $(LDADD)
|
||||
am_misdn_cleanl2_OBJECTS = cleanl2.$(OBJEXT)
|
||||
misdn_cleanl2_OBJECTS = $(am_misdn_cleanl2_OBJECTS)
|
||||
misdn_cleanl2_LDADD = $(LDADD)
|
||||
|
|
@ -74,10 +78,12 @@ CCLD = $(CC)
|
|||
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||||
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
|
||||
$(LDFLAGS) -o $@
|
||||
SOURCES = $(misdn_cleanl2_SOURCES) $(misdn_info_SOURCES) \
|
||||
$(misdn_log_SOURCES) $(misdn_rename_SOURCES)
|
||||
DIST_SOURCES = $(misdn_cleanl2_SOURCES) $(misdn_info_SOURCES) \
|
||||
$(misdn_log_SOURCES) $(misdn_rename_SOURCES)
|
||||
SOURCES = $(misdn_E1test_SOURCES) $(misdn_cleanl2_SOURCES) \
|
||||
$(misdn_info_SOURCES) $(misdn_log_SOURCES) \
|
||||
$(misdn_rename_SOURCES)
|
||||
DIST_SOURCES = $(misdn_E1test_SOURCES) $(misdn_cleanl2_SOURCES) \
|
||||
$(misdn_info_SOURCES) $(misdn_log_SOURCES) \
|
||||
$(misdn_rename_SOURCES)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
|
@ -205,7 +211,8 @@ misdn_info_SOURCES = info.c
|
|||
misdn_log_SOURCES = loghex.c
|
||||
misdn_rename_SOURCES = rename.c
|
||||
misdn_cleanl2_SOURCES = cleanl2.c
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
misdn_E1test_SOURCES = E1test.c
|
||||
AM_CPPFLAGS = -Wall -I$(top_srcdir)/include
|
||||
CLEANFILES = *~
|
||||
all: all-am
|
||||
|
||||
|
|
@ -327,6 +334,9 @@ clean-sbinPROGRAMS:
|
|||
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
|
||||
echo " rm -f" $$list; \
|
||||
rm -f $$list
|
||||
misdn_E1test$(EXEEXT): $(misdn_E1test_OBJECTS) $(misdn_E1test_DEPENDENCIES)
|
||||
@rm -f misdn_E1test$(EXEEXT)
|
||||
$(LINK) $(misdn_E1test_OBJECTS) $(misdn_E1test_LDADD) $(LIBS)
|
||||
misdn_cleanl2$(EXEEXT): $(misdn_cleanl2_OBJECTS) $(misdn_cleanl2_DEPENDENCIES)
|
||||
@rm -f misdn_cleanl2$(EXEEXT)
|
||||
$(LINK) $(misdn_cleanl2_OBJECTS) $(misdn_cleanl2_LDADD) $(LIBS)
|
||||
|
|
@ -346,6 +356,7 @@ mostlyclean-compile:
|
|||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/E1test.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cleanl2.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loghex.Po@am__quote@
|
||||
|
|
|
|||
Loading…
Reference in New Issue