Made isdnrep and isdnrate buildable under cygwin. See ChangeLog for details.
This commit is contained in:
tobiasb
parent
0062f5431d
commit
b4ebc28847
|
|
@ -1,3 +1,10 @@
|
|||
2007-01-05 Tobias Becker <tobiasb@isdn4linux.de>
|
||||
|
||||
* Makefile.in (NO_UTF8_CONV): Made this variable overwriteable.
|
||||
|
||||
* Makefile.in (NO_ISDNLOG): New, set to 1 in order to build
|
||||
everything but isdnlog itself.
|
||||
|
||||
2006-07-03 Tobias Becker <tobiasb@isdn4linux.de>
|
||||
|
||||
* Makefile.in (NO_UTF8_FILES): Fixed an error in the generation of
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
## $Id: Makefile.in,v 1.223 2006/07/03 19:47:51 tobiasb Exp $
|
||||
## $Id: Makefile.in,v 1.224 2007/01/05 04:23:57 tobiasb Exp $
|
||||
##
|
||||
## ISDN accounting for isdn4linux.
|
||||
##
|
||||
|
|
@ -19,6 +19,9 @@
|
|||
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
##
|
||||
## $Log: Makefile.in,v $
|
||||
## Revision 1.224 2007/01/05 04:23:57 tobiasb
|
||||
## Made isdnrep and isdnrate buildable under cygwin. See ChangeLog for details.
|
||||
##
|
||||
## Revision 1.223 2006/07/03 19:47:51 tobiasb
|
||||
## Fix in filelist generation for NO_UTF8=1.
|
||||
##
|
||||
|
|
@ -1752,8 +1755,11 @@ export NO_UTF8
|
|||
|
||||
CSEXT = .latin1
|
||||
|
||||
# NO_UTF8_CONV will be used as filter command
|
||||
export NO_UTF8_CONV := iconv -f UTF-8 -t ISO-8859-1
|
||||
# NO_UTF8_CONV will be used as filter command, prior overwrite possible
|
||||
ifndef NO_UTF8_CONV
|
||||
NO_UTF8_CONV := iconv -f UTF-8 -t ISO-8859-1
|
||||
endif
|
||||
export NO_UTF8_CONV
|
||||
|
||||
# files which have to be recoded for make all
|
||||
# use .conf.in files for selection; .conf files may not created yet
|
||||
|
|
@ -1945,6 +1951,11 @@ endif
|
|||
|
||||
PROGS = $(ISDNLOG) $(ISDNREP) $(ISDNBILL) $(ISDNCONF) $(ISDNRATE)
|
||||
|
||||
# do not build isdnlog when NO_ISDNLOG=1 is given
|
||||
ifeq ($(NO_ISDNLOG), 1)
|
||||
PROGS := $(filter-out $(ISDNLOG),$(PROGS))
|
||||
endif
|
||||
|
||||
ifeq ($(ORACLE),1)
|
||||
PROGS += $(ORA_LOAD)
|
||||
endif
|
||||
|
|
@ -1981,6 +1992,9 @@ $(FILES_USING_VERSION): Makefile
|
|||
options:
|
||||
@echo Making $< with
|
||||
@echo $(CC) $(CFLAGS) $(DEFS) $(INCLUDE)
|
||||
ifeq ($(NO_ISDNLOG), 1)
|
||||
@echo Build of isdnlog itself disabled by NO_ISDNLOG=1
|
||||
endif
|
||||
|
||||
progs: options $(PROGS)
|
||||
|
||||
|
|
@ -2015,10 +2029,12 @@ HEADERS := $(HEADERS) .depend
|
|||
endif
|
||||
|
||||
rootperm:
|
||||
ifneq ($(NO_ROOTPERM), 1)
|
||||
@echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
|
||||
@if gcc -x c -o G g && rm -f g && ./G ; then \
|
||||
echo ""; echo 'Do "make (un)install" as root!' ;echo ""; false; \
|
||||
fi
|
||||
endif
|
||||
|
||||
uninstall: rootperm
|
||||
if ps x | fgrep $(ISDNLOG) >/dev/null; then kill `cat $(RUNDIR)/isdnlog.isdnctrl0.pid` 2>/dev/null; fi
|
||||
|
|
@ -2100,15 +2116,17 @@ install-conf:
|
|||
|
||||
|
||||
install-progs:
|
||||
$(INSTALL_BIN) $(ISDNLOG) $(DESTDIR)$(SBINDIR)
|
||||
$(INSTALL_BIN) $(ISDNREP) $(DESTDIR)$(BINDIR)
|
||||
$(INSTALL_BIN) $(ISDNCONF) $(DESTDIR)$(BINDIR)
|
||||
$(INSTALL_BIN) $(ISDNRATE) $(DESTDIR)$(BINDIR)
|
||||
$(INSTALL_BIN) $(ISDNBILL) $(DESTDIR)$(BINDIR)
|
||||
ifneq ($(NO_ISDNLOG), 1)
|
||||
$(INSTALL_BIN) $(ISDNLOG) $(DESTDIR)$(SBINDIR)
|
||||
-@if (ps x | fgrep $(ISDNLOG) | grep -v grep) >/dev/null; then \
|
||||
kill -HUP `cat $(RUNDIR)/isdnlog.isdnctrl0.pid 2>/dev/null`; \
|
||||
echo "Restarting (the first) running isdnlog!" ; \
|
||||
fi
|
||||
endif
|
||||
|
||||
# FIXME: "Installing /usr/local/lib/isdn/tools/dest/dest.cdb" is confusing
|
||||
# because "/tools/dest" is only right for the source location of that file.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
2007-01-05 Tobias Becker <tobiasb@isdn4linux.de>
|
||||
|
||||
* isdnlog.c: Do no longer include <linux/limits.h> directly,
|
||||
it is included through isdnlog.h -> ../tools/tools.h ->
|
||||
../../lib/libisdn.h.
|
||||
|
||||
* processor.c (decode), functions.c (info, showmsg): Renamed
|
||||
iprintf to il_printf because of the integer printf function
|
||||
iprintf in the newlib C library.
|
||||
|
||||
2006-04-09 Tobias Becker <tobiasb@isdn4linux.de>
|
||||
|
||||
* processor.c (decode): Do not append same digits twice to called
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: functions.c,v 1.33 2002/01/26 20:43:31 akool Exp $
|
||||
/* $Id: functions.c,v 1.34 2007/01/05 04:23:58 tobiasb Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux. (log-module)
|
||||
*
|
||||
|
|
@ -19,6 +19,9 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
*
|
||||
* $Log: functions.c,v $
|
||||
* Revision 1.34 2007/01/05 04:23:58 tobiasb
|
||||
* Made isdnrep and isdnrate buildable under cygwin. See ChangeLog for details.
|
||||
*
|
||||
* Revision 1.33 2002/01/26 20:43:31 akool
|
||||
* isdnlog-4.56:
|
||||
* - dont set the Provider-field of the MySQL DB to "?*? ???" on incoming calls
|
||||
|
|
@ -673,7 +676,7 @@ void info(int chan, int reason, int state, char *msg)
|
|||
if (allflags & PRT_DEBUG_INFO)
|
||||
print_msg(PRT_DEBUG_INFO, "%d INFO> ", chan);
|
||||
|
||||
(void)iprintf(s, chan, call[chan].dialin ? ilabel : olabel, left, msg, right);
|
||||
(void)il_printf(s, chan, call[chan].dialin ? ilabel : olabel, left, msg, right);
|
||||
|
||||
print_msg(PRT_DEBUG_INFO, "%s", s);
|
||||
|
||||
|
|
@ -704,7 +707,7 @@ void showmsg(const char *fmt, ...)
|
|||
(void)vsnprintf(s, BUFSIZ, fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
(void)iprintf(s1, -1, mlabel, "", s, "");
|
||||
(void)il_printf(s1, -1, mlabel, "", s, "");
|
||||
print_msg(PRT_SHOWNUMBERS, "%s", s1);
|
||||
} /* showmsg */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: isdnlog.c,v 1.76 2005/02/23 14:33:39 tobiasb Exp $
|
||||
/* $Id: isdnlog.c,v 1.77 2007/01/05 04:23:58 tobiasb Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux. (log-module)
|
||||
*
|
||||
|
|
@ -19,6 +19,9 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
*
|
||||
* $Log: isdnlog.c,v $
|
||||
* Revision 1.77 2007/01/05 04:23:58 tobiasb
|
||||
* Made isdnrep and isdnrate buildable under cygwin. See ChangeLog for details.
|
||||
*
|
||||
* Revision 1.76 2005/02/23 14:33:39 tobiasb
|
||||
* New feature: provider skipping.
|
||||
* Certain providers can be completely ignored (skipped) when loading the
|
||||
|
|
@ -545,7 +548,8 @@
|
|||
|
||||
#define _ISDNLOG_C_
|
||||
|
||||
#include <linux/limits.h>
|
||||
/* included via isdnlog/isdnlog.h -> tools/tools.h -> ../lib/libisdn.h
|
||||
#include <linux/limits.h> */
|
||||
#include <termios.h>
|
||||
|
||||
#include "isdnlog.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: isdnlog.h,v 1.29 2004/09/05 22:04:56 tobiasb Exp $
|
||||
/* $Id: isdnlog.h,v 1.30 2007/01/05 04:23:58 tobiasb Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux.
|
||||
*
|
||||
|
|
@ -20,6 +20,9 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: isdnlog.h,v $
|
||||
* Revision 1.30 2007/01/05 04:23:58 tobiasb
|
||||
* Made isdnrep and isdnrate buildable under cygwin. See ChangeLog for details.
|
||||
*
|
||||
* Revision 1.29 2004/09/05 22:04:56 tobiasb
|
||||
* New parameter file entry "ignoreUPD" for suppressing "Unexpected
|
||||
* discrimator (...)" messages, demanded by Günther J. Niederwimmer
|
||||
|
|
@ -333,7 +336,7 @@
|
|||
|
||||
/****************************************************************************/
|
||||
|
||||
#include <tools.h>
|
||||
#include <tools.h> /* includes linux/isdn.h for __linux__ */
|
||||
#include <holiday.h>
|
||||
#include <rate.h>
|
||||
#include "socket.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: processor.c,v 1.133 2006/05/01 13:52:31 tobiasb Exp $
|
||||
/* $Id: processor.c,v 1.134 2007/01/05 04:23:58 tobiasb Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux. (log-module)
|
||||
*
|
||||
|
|
@ -19,6 +19,9 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: processor.c,v $
|
||||
* Revision 1.134 2007/01/05 04:23:58 tobiasb
|
||||
* Made isdnrep and isdnrate buildable under cygwin. See ChangeLog for details.
|
||||
*
|
||||
* Revision 1.133 2006/05/01 13:52:31 tobiasb
|
||||
* Fix for special case with DUALFIX_SRCNUM (-2/dual= includes 0x200).
|
||||
* A more general approach would do reordering of layer 2 frames.
|
||||
|
|
@ -2291,7 +2294,7 @@ static void decode(int chan, register char *p, int type, int version, int tei)
|
|||
}
|
||||
if (n == AOC_OTHER) {
|
||||
if (asnm && *asnm) {
|
||||
(void)iprintf(s1, -1, mlabel, "", asnm, "\n");
|
||||
(void)il_printf(s1, -1, mlabel, "", asnm, "\n");
|
||||
print_msg(PRT_SHOWNUMBERS, "%s", s1);
|
||||
} /* if */
|
||||
}
|
||||
|
|
@ -2731,7 +2734,7 @@ static void decode(int chan, register char *p, int type, int version, int tei)
|
|||
info(chan, PRT_SHOWNUMBERS, STATE_RING, s1);
|
||||
|
||||
if (cl != NULL) {
|
||||
iprintf(s1, chan, callfmt);
|
||||
il_printf(s1, chan, callfmt);
|
||||
fprintf(cl, "%s\n", s1);
|
||||
fclose(cl);
|
||||
} /* if */
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
2007-01-05 Tobias Becker <tobiasb@isdn4linux.de>
|
||||
|
||||
* isdnrep.c: Do not include <linux/limits.h>, this is already done
|
||||
by ../../lib/libisdn.h.
|
||||
|
||||
* isdnbill.c: Do not include <asm/param.h>, it is no longer needed.
|
||||
|
||||
2005-01-22 Tobias Becker <tobiasb@isdn4linux.de>
|
||||
|
||||
* opt_time.c (get_ytime): New function for setting time relative
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: isdnbill.c,v 1.21 2006/07/03 15:51:27 keil Exp $
|
||||
/* $Id: isdnbill.c,v 1.22 2007/01/05 04:23:58 tobiasb Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux. (Billing-module)
|
||||
*
|
||||
|
|
@ -26,7 +26,6 @@
|
|||
#include "isdnlog.h"
|
||||
#include "tools/zone.h"
|
||||
#include <unistd.h>
|
||||
#include <asm/param.h>
|
||||
#include <math.h>
|
||||
#include "dest.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: isdnrep.c,v 1.103 2006/07/03 15:51:27 keil Exp $
|
||||
/* $Id: isdnrep.c,v 1.104 2007/01/05 04:23:58 tobiasb Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux. (Report-module)
|
||||
*
|
||||
|
|
@ -24,6 +24,9 @@
|
|||
*
|
||||
*
|
||||
* $Log: isdnrep.c,v $
|
||||
* Revision 1.104 2007/01/05 04:23:58 tobiasb
|
||||
* Made isdnrep and isdnrate buildable under cygwin. See ChangeLog for details.
|
||||
*
|
||||
* Revision 1.103 2006/07/03 15:51:27 keil
|
||||
* - HZ is not used anymore, this value is defined as duration in
|
||||
* 1/100 seconds independ from system HZ value
|
||||
|
|
@ -216,7 +219,7 @@
|
|||
#include <sys/param.h>
|
||||
#include <dirent.h>
|
||||
#include <search.h>
|
||||
#include <linux/limits.h>
|
||||
/* included by libisdn.h: #include <linux/limits.h> */
|
||||
#include <string.h>
|
||||
|
||||
#include "dest.h"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,16 @@
|
|||
2007-01-05 Tobias Becker <tobiasb@isdn4linux.de>
|
||||
|
||||
* tools.h, tools.c (iprintf, il_printf): Renamed iprintf to
|
||||
il_printf because of the integer printf function iprintf in the
|
||||
newlib C library.
|
||||
|
||||
* tools.h: Replaced linux by __linux as condition for inclusion
|
||||
of <sys/kd.h> and <linux/isdn.h>. Set ISDN_MSNLEN to 32 if
|
||||
<linux/isdn.h> is unavailable.
|
||||
|
||||
* telnum.c (stpcpy): Added this non IEEE 1003.1 function if
|
||||
_NEWLIB_VERSION is defined and indicates the newlib C library.
|
||||
|
||||
2006-02-05 Tobias Becker <tobiasb@isdn4linux.de>
|
||||
|
||||
* rate.c (initRate, appendArea, get_area1): Remember federal zone for
|
||||
|
|
|
|||
|
|
@ -95,6 +95,14 @@
|
|||
|
||||
/* #define DEBUG 1 */
|
||||
|
||||
#ifdef _NEWLIB_VERSION
|
||||
/* provide missing stpcpy, lines taken from dietlibc-0.30/libcompat/stpcpy.c */
|
||||
static char * stpcpy (char *dst, const char *src) {
|
||||
while ((*dst++ = *src++));
|
||||
return (dst-1);
|
||||
}
|
||||
#endif
|
||||
|
||||
static TELNUM defnum;
|
||||
|
||||
TELNUM *getMynum(void)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: tools.c,v 1.54 2005/01/12 16:28:05 tobiasb Exp $
|
||||
/* $Id: tools.c,v 1.55 2007/01/05 04:23:58 tobiasb Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux. (Utilities)
|
||||
*
|
||||
|
|
@ -19,6 +19,9 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: tools.c,v $
|
||||
* Revision 1.55 2007/01/05 04:23:58 tobiasb
|
||||
* Made isdnrep and isdnrate buildable under cygwin. See ChangeLog for details.
|
||||
*
|
||||
* Revision 1.54 2005/01/12 16:28:05 tobiasb
|
||||
* Fixed processing of numbers without an entry in dest.cdb like +8.
|
||||
*
|
||||
|
|
@ -1092,7 +1095,7 @@ static char *ltoa(register unsigned long num, register char *p, register int rad
|
|||
|
||||
/****************************************************************************/
|
||||
|
||||
int iprintf(char *obuf, int chan, register char *fmt, ...)
|
||||
int il_printf(char *obuf, int chan, register char *fmt, ...)
|
||||
{
|
||||
register char *p, *s;
|
||||
register int c, i, who;
|
||||
|
|
@ -1349,7 +1352,7 @@ go: if (!ndigit)
|
|||
} /* while */
|
||||
} /* for */
|
||||
|
||||
} /* iprintf */
|
||||
} /* il_printf */
|
||||
|
||||
/****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: tools.h,v 1.64 2005/02/23 14:33:40 tobiasb Exp $
|
||||
/* $Id: tools.h,v 1.65 2007/01/05 04:23:58 tobiasb Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux.
|
||||
*
|
||||
|
|
@ -20,6 +20,9 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: tools.h,v $
|
||||
* Revision 1.65 2007/01/05 04:23:58 tobiasb
|
||||
* Made isdnrep and isdnrate buildable under cygwin. See ChangeLog for details.
|
||||
*
|
||||
* Revision 1.64 2005/02/23 14:33:40 tobiasb
|
||||
* New feature: provider skipping.
|
||||
* Certain providers can be completely ignored (skipped) when loading the
|
||||
|
|
@ -644,7 +647,7 @@
|
|||
#include <math.h>
|
||||
#include <syslog.h>
|
||||
#include <sys/ioctl.h>
|
||||
#ifdef linux
|
||||
#ifdef __linux__
|
||||
#include <sys/kd.h>
|
||||
#include <linux/isdn.h>
|
||||
#else
|
||||
|
|
@ -710,6 +713,9 @@
|
|||
|
||||
/****************************************************************************/
|
||||
|
||||
#ifndef ISDN_MSNLEN /* if linux undefined and <linux/isdn.h> not included */
|
||||
#define ISDN_MSNLEN 32
|
||||
#endif
|
||||
#define NUMSIZE (ISDN_MSNLEN + 1)
|
||||
#define FNSIZE 64
|
||||
#define RETSIZE 128
|
||||
|
|
@ -1281,7 +1287,7 @@ _EXTERN char *time2str(time_t sec);
|
|||
_EXTERN char *double2clock(double n);
|
||||
_EXTERN char *vnum(int chan, int who);
|
||||
_EXTERN char *i2a(int n, int l, int base);
|
||||
_EXTERN int iprintf(char *obuf, int chan, register char *fmt, ...);
|
||||
_EXTERN int il_printf(char *obuf, int chan, register char *fmt, ...);
|
||||
_EXTERN char *qmsg(int type, int version, int val);
|
||||
_EXTERN char *Myname;
|
||||
_EXTERN char *zonen[MAXZONES];
|
||||
|
|
|
|||
Loading…
Reference in New Issue