Last character of unterminated line was ignored.
Minor bug fix in 2600 Hz pulse dialing.
modified: README
modified: action_vbox.cpp
modified: crypt.cpp
modified: extension.c
modified: gsm_conf.c
modified: interface.c
modified: macro.h
modified: route.c
modified: ss5.cpp
modified: ss5.h
-> Just add 'extern' right below your external interface definition, or give
external interface name in routing.conf: ": extern interfaces=XXXXX"
- Added experimental CCITT No. 5 signalling system. (for educational purpose)
+- Fixed/simplyfied config parser. The last digit of the last line was ignored.
fduse++;
i = 0;
- while((fgets(buffer,sizeof(buffer),fp))) {
- buffer[sizeof(buffer)-1] = '\0';
- if (buffer[0]) buffer[strlen(buffer)-1] = '\0';
-
+ while((GETLINE(buffer, fp))) {
name[0] = callerid[0] = '\0';
mon = mday = hour = min = 0;
sscanf(buffer, "%s %d %d %d %d %d %s", name, &year, &mon, &mday, &hour, &min, callerid);
}
fduse++;
buffer[sizeof(buffer-1)] = '\0';
- while(fgets(buffer, sizeof(buffer)-1, fp)) {
+ while(GETLINE(buffer, fp)) {
if (!!strncmp(buffer, "bogomips", 8))
continue;
if (!strchr(buffer, ':'))
ext->vbox_codec = CODEC_MONO;
line=0;
- while((fgets(buffer, sizeof(buffer), fp))) {
+ while((GETLINE(buffer, fp))) {
line++;
- buffer[sizeof(buffer)-1] = '\0';
- if (buffer[0]) buffer[strlen(buffer)-1] = '\0';
p = buffer;
while(*p <= 32) { /* skip spaces */
}
line=0;
- while((fgets(buffer, sizeof(buffer), fp))) {
+ while((GETLINE(buffer, fp))) {
line++;
- buffer[sizeof(buffer)-1] = '\0';
- if (buffer[0]) buffer[strlen(buffer)-1] = '\0';
p = buffer;
while(*p <= 32) { /* skip spaces */
}
line=0;
- while((fgets(buffer, sizeof(buffer), fp))) {
+ while((GETLINE(buffer, fp))) {
line++;
- buffer[sizeof(buffer)-1] = '\0';
- if (buffer[0]) buffer[strlen(buffer)-1] = '\0';
p = buffer;
while(*p <= 32) { /* skip spaces */
}
line=0;
- while((fgets(buffer, sizeof(buffer), fp))) {
+ while((GETLINE(buffer, fp))) {
line++;
- buffer[sizeof(buffer)-1] = '\0';
- if (buffer[0]) buffer[strlen(buffer)-1] = '\0';
p = buffer;
while(*p <= 32) { /* skip spaces */
}
line=0;
- while((fgets(buffer, sizeof(buffer), fp))) {
+ while((GETLINE(buffer, fp))) {
line++;
- buffer[sizeof(buffer)-1] = '\0';
- if (buffer[0]) buffer[strlen(buffer)-1] = '\0';
p = buffer;
while(*p <= 32) { /* skip spaces */
}
line=0;
- while((fgets(buffer,sizeof(buffer),fp))) {
+ while((GETLINE(buffer, fp))) {
line++;
- buffer[sizeof(buffer)-1]=0;
- if (buffer[0]) buffer[strlen(buffer)-1]=0;
p=buffer;
while(*p <= 32) { /* skip spaces */
}
line=0;
- while((fgets(buffer,sizeof(buffer),fp))) {
- buffer[sizeof(buffer)-1]=0;
- if (buffer[0]) buffer[strlen(buffer)-1]=0;
+ while((GETLINE(buffer, fp))) {
p=buffer;
line++;
if (!addr)
fatal(function, line, "No memory for %d bytes.\n", size);
memset(addr, 0, size);
- return(addr);
+ return addr;
}
/* memory freeing with clearing memory to prevent using freed memory */
free(addr);
}
+/* fill buffer and be sure that it's result is 0-terminated, also remove newline */
+#define GETLINE(buffer, fp) _getline(buffer, sizeof(buffer), fp)
+static inline char *_getline(char *buffer, int size, FILE *fp)
+{
+ if (!fgets(buffer, size-1, fp))
+ return NULL;
+ buffer[size-1] = '\0';
+ if (!buffer[0])
+ return buffer;
+ if (buffer[strlen(buffer)-1] == '\n')
+ buffer[strlen(buffer)-1] = '\0';
+ if (buffer[strlen(buffer)-1] == '\r')
+ buffer[strlen(buffer)-1] = '\0';
+ return buffer;
+}
+
go_leaf:
line[nesting]=0;
go_root:
- while((fgets(buffer,sizeof(buffer),fp[nesting])))
+ while((GETLINE(buffer, fp[nesting])))
{
line[nesting]++;
- buffer[sizeof(buffer)-1]=0;
- if (buffer[0]) buffer[strlen(buffer)-1]=0;
p = buffer;
/* remove tabs */
end_trace();
new_ss5_state(SS5_STATE_IDLE);
- do_setup(dial);
+ do_setup(dial, 1);
new_state(PORT_STATE_IN_PROCEEDING);
}
}
if (p_state == PORT_STATE_IN_SETUP) {
/* sending digit as setup */
- do_setup(dial); /* include 'a' == KP1 */
+ do_setup(dial, 0); /* include 'a' == KP1 */
new_state(PORT_STATE_IN_OVERLAP);
} else {
/* sending digit as information */
/*
* create endpoint and send setup
*/
-void Pss5::do_setup(char *dial)
+void Pss5::do_setup(char *dial, int complete)
{
class Endpoint *epoint;
struct lcr_msg *message;
SCPY(p_dialinginfo.id, dial);
- p_dialinginfo.sending_complete = 1;
+ p_dialinginfo.sending_complete = complete;
p_callerinfo.present = INFO_PRESENT_NOTAVAIL;
p_callerinfo.screen = INFO_SCREEN_NETWORK;
p_callerinfo.ntype = INFO_NTYPE_NOTPRESENT;
void start_signal(int);
void start_outgoing(void);
void do_release(int cause, int location);
- void do_setup(char *digit);
+ void do_setup(char *digit, int complete);
void seizing_ind(void);
void digit_ind(char digit);