isdnlog-3.56 (for Karsten)

This commit is contained in:
Andreas Kool 1999-10-22 19:57:59 +00:00
parent 1298fe0f15
commit 6774150521
6 changed files with 1382 additions and 1191 deletions

View File

@ -19,6 +19,12 @@
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
## ##
## $Log$ ## $Log$
## Revision 1.109 1999/09/26 10:55:19 akool
## isdnlog-3.55
## - Patch from Oliver Lauer <Oliver.Lauer@coburg.baynet.de>
## added hup3 to option file
## - changed country-de.dat to ISO 3166 Countrycode / Airportcode
##
## Revision 1.108 1999/09/22 09:02:59 akool ## Revision 1.108 1999/09/22 09:02:59 akool
## isdnlog-3.54 ## isdnlog-3.54
## ##
@ -773,7 +779,7 @@ SERVICEFILE = /etc/services
# DON'T EDIT BELOW THIS LINE # DON'T EDIT BELOW THIS LINE
###################################################################### ######################################################################
VERSION = 3.55 VERSION = 3.56
MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \ MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \
isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \ isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \

View File

@ -82,7 +82,7 @@ T:IL
N:Palestina N:Palestina
A:Palästina, Palestinensisches Autonomiegebiet A:Palästina, Palestinensisches Autonomiegebiet
C:+972777 C:+972777
T:PP # Fixme: no iso3166 code defined yet T:PS # since 11.10.1999
N:Ver. Arabische Emirate N:Ver. Arabische Emirate
A:Vereinigte Arabische Emirate, Ver.Arab. Emirate, Vereinigte Arab. Emirate A:Vereinigte Arabische Emirate, Ver.Arab. Emirate, Vereinigte Arab. Emirate
@ -562,7 +562,7 @@ N:Philippinen
E:Phillipines E:Phillipines
A:Phillippinen A:Phillippinen
C:+63 C:+63
R:PH T:PH
N:Indonesien N:Indonesien
E:Indonesia E:Indonesia
@ -582,7 +582,7 @@ T:AU
N:Malaysia N:Malaysia
A:Malaysien A:Malaysien
C:+60 C:+60
R:MY T:MY
N:Niederl. Antillen N:Niederl. Antillen
A:Niederländische Antillen, Antillen (Niederlande) A:Niederländische Antillen, Antillen (Niederlande)
@ -629,7 +629,7 @@ T:EC
N:Guyana N:Guyana
A:Guayana A:Guayana
C:+592 C:+592
R:GY T:GY
N:Bolivien N:Bolivien
E:Bolivia E:Bolivia
@ -726,6 +726,7 @@ A:St. Pierre & Miquelon,St. Pierre
E:Saint Pierre and Miquelon E:Saint Pierre and Miquelon
C:+508 C:+508
R:FR R:FR
T:PM
N:Panama Mobilfunk N:Panama Mobilfunk
C:+5076 C:+5076
@ -973,7 +974,7 @@ E:Rome
A:Italien - Rom A:Italien - Rom
C:+396 C:+396
R:IT R:IT
R:ROM T:ROM
N:Vatikan N:Vatikan
A:Vatikanstadt / Rom, Vatikanstadt, Vatican City A:Vatikanstadt / Rom, Vatikanstadt, Vatican City
@ -1023,10 +1024,10 @@ N:Monaco
C:+377 C:+377
T:MC T:MC
N:Monaco Mobilfunk # N:Monaco Mobilfunk
C:+377 # fixme # C:+377 # fixme
R:MC # R:MC
T:_MCMF # T:_MCMF
N:Andorra N:Andorra
C:+376 C:+376
@ -1082,7 +1083,7 @@ C:+358
T:FI T:FI
N:Finnland Mobilfunk N:Finnland Mobilfunk
C:+358 # fixme C:+35840, +358400, +35841, +35842, +35843, +35849, +35850, +358500
R:FI R:FI
T:_FIMF T:_FIMF
@ -1097,6 +1098,7 @@ A:Zypern (Nord), Zypern (Nordzypern), Cyprus (north), Cyprus (turk)
E:Turk Cyprus E:Turk Cyprus
C:+90392 C:+90392
R:TK R:TK
T:_CYTK
N:Malta N:Malta
C:+356 C:+356
@ -1468,12 +1470,12 @@ C:+244
T:AO T:AO
N:Zaire N:Zaire
A:Kongo (Demokratische Republik), Kongo (DR)
A:Kongo (Republik),Kongo (Rebublik) A:Kongo (Republik),Kongo (Rebublik)
C:+243 C:+243
T:ZR T:ZR
N:Kongo N:Kongo
A:Kongo (Demokratische Republik), Kongo (DR)
E:Congo E:Congo
C:+242 C:+242
T:CG T:CG

View File

@ -20,6 +20,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.38 1999/09/26 10:55:20 akool
* isdnlog-3.55
* - Patch from Oliver Lauer <Oliver.Lauer@coburg.baynet.de>
* added hup3 to option file
* - changed country-de.dat to ISO 3166 Countrycode / Airportcode
*
* Revision 1.37 1999/08/20 19:28:05 akool * Revision 1.37 1999/08/20 19:28:05 akool
* isdnlog-3.45 * isdnlog-3.45
* - removed about 1 Mb of (now unused) data files * - removed about 1 Mb of (now unused) data files
@ -708,12 +714,12 @@ int print_in_modules(const char *fmt, ...)
int main(int argc, char *argv[], char *envp[]) int main(int argc, char *argv[], char *envp[])
{ {
int c, len; int c, len = 0;
int Cnt = 0; int Cnt = 0;
section *conf_dat = NULL; section *conf_dat = NULL;
char *myname = basename(argv[0]); char *myname = basename(argv[0]);
FILE *fp; FILE *fp;
char *ptr; char *ptr = "";
static char usage[] = "%s: usage: %s [ -%s ]\n"; static char usage[] = "%s: usage: %s [ -%s ]\n";
static char options[] = "ADdn:a:t:f:c:wslimqgV1M:"; static char options[] = "ADdn:a:t:f:c:wslimqgV1M:";

File diff suppressed because it is too large Load Diff

View File

@ -19,6 +19,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.48 1999/09/26 10:55:20 akool
* isdnlog-3.55
* - Patch from Oliver Lauer <Oliver.Lauer@coburg.baynet.de>
* added hup3 to option file
* - changed country-de.dat to ISO 3166 Countrycode / Airportcode
*
* Revision 1.47 1999/09/22 09:03:00 akool * Revision 1.47 1999/09/22 09:03:00 akool
* isdnlog-3.54 * isdnlog-3.54
* *
@ -361,7 +367,7 @@ extern const char *basename (const char *name);
#include "country.h" #include "country.h"
#include "rate.h" #include "rate.h"
#define LENGTH 512 /* max length of lines in data file */ #define LENGTH 1024 /* max length of lines in data file */
#define STRINGS 8 /* number of buffers for printRate() */ #define STRINGS 8 /* number of buffers for printRate() */
#define STRINGL 64 /* length of printRate() buffer */ #define STRINGL 64 /* length of printRate() buffer */
#define DEFAULT_FORMAT "%.2f" /* default format for printRate() */ #define DEFAULT_FORMAT "%.2f" /* default format for printRate() */
@ -843,7 +849,7 @@ int initRate(char *conf, char *dat, char *dom, char **msg)
s+=2; while (isblank(*s)) s++; s+=2; while (isblank(*s)) s++;
snprintf (path, LENGTH, dom, s); snprintf (path, LENGTH, dom, s);
if (initZone(prefix, path, &c)==0) { if (initZone(prefix, path, &c)==0) {
if (msg) notice ("%s", c); if (msg && *c) notice ("%s", c);
} else { } else {
warning (dat, c); warning (dat, c);
} }

View File

@ -19,6 +19,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.16 1999/07/31 09:25:49 akool
* getRate() speedup
*
* Revision 1.15 1999/07/26 16:28:51 akool * Revision 1.15 1999/07/26 16:28:51 akool
* getRate() speedup from Leo * getRate() speedup from Leo
* *
@ -510,9 +513,13 @@ static int _initZone(int provider, char *path, char **msg, bool area_only)
} }
else { else {
if (msg) if (msg)
#if 1
*message = 0;
#else
snprintf (message, LENGTH, snprintf (message, LENGTH,
"Zone V%s: Provider %d is open as '%s' for provider %d", "Zone V%s: Provider %d is open as '%s' for provider %d",
version, provider, path, sthp[sthp[ocount].real].provider); version, provider, path, sthp[sthp[ocount].real].provider);
#endif
} }
return 0; return 0;
} }