Attachment #677473 for bug #708512

View | Details | Raw Unified | Return to bug 708512
Collapse All | Expand All




#define ALPHABET_UNKNOWN        4
#define ALPHABET_DEFAULT        0

extern char process_title[32];         // smsd for main task, NOTIFIER or CHILD, name of a modem for other tasks.
extern int process_id;                 // -1 for main task, all modems have numbers starting with 0.
                                // This is the same as device, can be used like devices[process_id] if IS_MODEM_PROCESS.

extern time_t process_start_time;

extern int modem_handle;               // Handle for modem.

extern int put_command_timeouts;
extern unsigned long long put_command_sent; // 3.1.16beta.
extern char tmpdir[PATH_MAX];          // 3.1.16beta.

typedef struct
{


// NOTE for regular run intervals: effective value is at least delaytime.

extern char configfile[PATH_MAX];	// Path to config file
extern char d_spool[PATH_MAX];		// Spool directory
extern char d_failed[PATH_MAX];	// Failed spool directory
extern char d_failed_copy[PATH_MAX];	// 3.1.17.
extern char d_incoming[PATH_MAX];	// Incoming spool directory
extern char d_incoming_copy[PATH_MAX]; // 3.1.16beta2.
extern char d_report[PATH_MAX];	// Incoming report spool directory
extern char d_report_copy[PATH_MAX];	// 3.1.17.
extern char d_phonecalls[PATH_MAX];    // Incoming phonecalls data directory
extern char d_saved[PATH_MAX];         // Directory for smsd's internal use, concatenation storage files etc.
extern char d_sent[PATH_MAX];		// Sent spool directory
extern char d_sent_copy[PATH_MAX];	// 3.1.17.
extern char d_checked[PATH_MAX];	// Spool directory for checked messages (only used when no provider queues used)
extern char eventhandler[PATH_MAX];	// Global event handler program or script
extern char alarmhandler[PATH_MAX];	// Global alarm handler program or script
extern char checkhandler[PATH_MAX];    // Handler that checks if the sms file is valid.
extern int alarmlevel;			// Alarm Level (9=highest). Verbosity of alarm handler.
extern char logfile[PATH_MAX];		// Name or Handle of Log File
extern int  loglevel;			// Log Level (9=highest). Verbosity of log file.
extern _queue queues[NUMBER_OF_MODEMS]; // Queues
extern _device devices[NUMBER_OF_MODEMS]; // Modem devices
extern int delaytime;			// sleep-time after workless
extern int delaytime_mainprocess;      // sleep-time after workless, main process. If -1, delaytime is used.
extern int blocktime;			// sleep-time after multiple errors
extern int blockafter;                 // Block modem after n errors
extern int errorsleeptime;		// sleep-time after each error
extern int autosplit;			// Splitting of large text messages 0=no, 1=yes 2=number with text, 3=number with UDH
extern int receive_before_send;	// if 1 smsd tries to receive one message before sending
extern int store_received_pdu;         // 0=no, 1=unsupported pdu's only, 2=unsupported and 8bit/unicode, 3=all
extern int store_sent_pdu;             // 0=no, 1=failed pdu's only, 2=failed and 8bit/unicode, 3=all
extern int validity_period;            // Validity period for messages.
extern int decode_unicode_text;        // 1 if unicode text is decoded internally.
extern int internal_combine;           // 1 if multipart message is combined internally.
extern int internal_combine_binary;    // 1 if multipart binary message is combined internally. Defaults to internal_combine.
extern int keep_filename;              // 0 if unique filename is created to each directory when a message file is moved.
extern int store_original_filename;    // 1 if an original filename is saved to message file when it's moved from
// outgoing directory to spooler. Works together with keep_filename.
extern int date_filename;              // 1 or 2 if YYYYMMDD is included to the filename of incoming message.
extern char regular_run[PATH_MAX];     // Script/program which is run regularly.
extern int regular_run_interval;       // Number of seconds between running a regular_run script/progdam.
extern char admin_to[SIZE_TO];         // Destination number for administrative messages.
extern int filename_preview;           // Number of chars of message text to concatenate to filename.
extern int incoming_utf8;              // 1 if incoming files are saved using UTF-8 character set.
extern int outgoing_utf8;              // 1 if outgoing files are automatically converted from UTF-8 to ISO and GSM.
extern int log_charconv;               // 1 if character set conversion is logged.
extern int log_single_lines;           // 1 if linefeeds are removed from the modem response to be logged.
extern int executable_check;           // 0 if eventhandler and other executables are NOT checked during the startup checking.
extern int keep_messages;              // For testing purposes: messages are not deleted and smsd stops after first run.
extern char priviledged_numbers[SIZE_PRIVILEDGED_NUMBERS]; // Priviledged numbers in incoming messages.
extern int ic_purge_hours;             // If internal_combine is used, concatenation storage is checked every ic_purge_interval minutes
extern int ic_purge_minutes;           // and if there is message parts older than defined, they are handled or deleted.
extern int ic_purge_read;              // 1 = message parts are stored as single messages. 0 = parts are just deleted.
extern int ic_purge_interval;          //
extern char shell[PATH_MAX];           // Shell used to run eventhandler, defaults to /bin/sh
extern char adminmessage_device[32];   // Name of device used to send administrative messages of mainspooler.
extern int smart_logging;              // 1 = if loglevel is less than 7, degug log is written is there has been any errors.
extern int status_signal_quality;      // 1 = signal quality is written to status file.
extern int status_include_counters;    // 1 = succeeded, failed and received counters are included in the status line.
extern int status_include_uptime;      // 3.1.16beta: 1 = include started & uptime line in the status file.
extern int hangup_incoming_call;       // 1 = if detected unexpected input contains RING and we want to end call.
extern int max_continuous_sending;     // Defines when sending is breaked to do check/do other tasks. Time in minutes.
extern int voicecall_hangup_ath;       // If ATH is used instead of AT+CHUP.

// 3.1.5:
extern int trust_outgoing;             // 1 = it's _sure_ that files are created by rename AND permissions are correct. Speeds up spooling.

// 3.1.5:
extern int ignore_outgoing_priority;   // 1 = Priority: high header is not checked. Speeds up spooling.

// 3.1.7:
extern int ignore_exec_output;         // 1 = stdout and stderr of eventhandlers is _not_ checked.

// 3.1.7:
extern mode_t conf_umask;              // File mode creation mask for smsd and modem processes.

// 3.1.7:
extern int trim_text;                  // 1 = trailing whitespaces are removed from text:

// 3.1.7:
extern int use_linux_ps_trick;         // 1 = change argv[0] to "smsd: MAINPROCESS", "smsd: GSM1" etc.

// 3.1.7:
extern int log_unmodified;

// 3.1.7:
extern char suspend_filename[PATH_MAX];

// 3.1.9:
extern int spool_directory_order;

// 3.1.9: 1 if read_from_modem is logged.
extern int log_read_from_modem;

// 3.1.16beta2: log_read_timing for performance tuning.
extern int log_read_timing;

// 3.1.16beta:
extern int log_response_time;

// 3.1.16beta2:
extern int default_alphabet;

// 3.1.17: Child process for the mainprocess:
extern char mainprocess_child[PATH_MAX];
extern char mainprocess_child_args[PATH_MAX];

// 3.1.17: Notifier for the mainprocess:
extern int mainprocess_notifier;

// 3.1.17: If *_copy was made, evenhandler can use it instead of original file:
extern int eventhandler_use_copy;

// 3.1.17: This defines how long to sleep while looping:
extern int sleeptime_mainprocess;

// 3.1.17: Defines how often PID is checked to detect if another smsd is running:
extern int check_pid_interval;

// 3.1.18: start script/program for mainprocess:
extern char mainprocess_start[PATH_MAX];
extern char mainprocess_start_args[PATH_MAX];

extern int message_count;              // Counter for sent messages. Multipart message is one message.

extern volatile sig_atomic_t break_workless_delay; // To break the delay when SIGCONT is received.
extern volatile sig_atomic_t terminate; // To terminate when SIGTERM is received.

extern char username[65];              // user and group name which are used to run.
extern char groupname[65];             // (max length is just a guess)

extern char infofile[PATH_MAX];        // Hepler file for stopping the smsd smoothly.
extern char pidfile[PATH_MAX];         // File where a process id is stored.

// Command line arguments:
extern char arg_username[65];
extern char arg_groupname[65];
extern char arg_infofile[PATH_MAX];
extern char arg_pidfile[PATH_MAX];
extern char arg_logfile[PATH_MAX];
extern int arg_terminal;
// 3.1.7:
extern char arg_7bit_packed[512];
extern int do_encode_decode_arg_7bit_packed;

extern int terminal;                   // 1 if smsd is communicating with terminal.
extern pid_t device_pids[NUMBER_OF_MODEMS]; // Pid's of modem processes.
extern char run_info[PATH_MAX];        // Information about external script/program execution.

extern char communicate[32];           // Device name for terminal communication mode.

extern char international_prefixes[PATH_MAX +1];
extern char national_prefixes[PATH_MAX +1];

// Storage for startup errors:
extern char *startup_err_str;
extern int startup_err_count;

// Storage for PDU's:
extern char *incoming_pdu_store;
extern char *outgoing_pdu_store;
extern char *routed_pdu_store;

// Storage for getfile errors:
extern char *getfile_err_store;

// Text buffer for error messages:
extern char tb[SIZE_TB];

// Buffer for SIM memory checking:
extern char *check_memory_buffer;
extern size_t check_memory_buffer_size;

extern int os_cygwin;                  // 1 if we are on Cygwin.

extern char language_file[PATH_MAX];   // File name of translated headers.
extern char yes_chars[SIZE_HEADER];    // Characters which mean "yes" in the yesno() question.
extern char no_chars[SIZE_HEADER];     // See details inside read_translation() function.
extern char yes_word[SIZE_HEADER];     // "yes" printed as an output.
extern char no_word[SIZE_HEADER];      // "no"
extern char datetime_format[SIZE_HEADER]; // strftime format string for time stamps (not inside status reports).
extern char logtime_format[SIZE_HEADER]; // 3.1.7: strftime format string for logging time stamps
extern char date_filename_format[SIZE_HEADER]; // 3.1.7: strftime format string for date_filename
extern int translate_incoming;         // 0 if incoming message headers are NOT transtaled.

// 3.1.14:
extern int logtime_us;
extern int logtime_ms;

// 3.1.14:
extern int shell_test;

// Next two are for debugging purposes:
extern int enable_smsd_debug;
extern char smsd_debug[SIZE_SMSD_DEBUG]; // Header of an outgoing message file.

// 3.1.20: Alt keys in communication mode:
#define COMMUNICATE_A_KEY_COUNT 10
extern char communicate_a_keys[COMMUNICATE_A_KEY_COUNT][256];

/* initialize all variable with default values */





#include "modeminit.h"
#include "charshift.h"


/* global variables */
char process_title[32];         // smsd for main task, NOTIFIER or CHILD, name of a modem for other tasks.
int process_id;                 // -1 for main task, all modems have numbers starting with 0.
                                // This is the same as device, can be used like devices[process_id] if IS_MODEM_PROCESS.

time_t process_start_time;

int modem_handle;               // Handle for modem.

int put_command_timeouts;
unsigned long long put_command_sent; // 3.1.16beta.
char tmpdir[PATH_MAX];          // 3.1.16beta.

// NOTE for regular run intervals: effective value is at least delaytime.

char configfile[PATH_MAX];	// Path to config file
char d_spool[PATH_MAX];		// Spool directory
char d_failed[PATH_MAX];	// Failed spool directory
char d_failed_copy[PATH_MAX];	// 3.1.17.
char d_incoming[PATH_MAX];	// Incoming spool directory
char d_incoming_copy[PATH_MAX]; // 3.1.16beta2.
char d_report[PATH_MAX];	// Incoming report spool directory
char d_report_copy[PATH_MAX];	// 3.1.17.
char d_phonecalls[PATH_MAX];    // Incoming phonecalls data directory
char d_saved[PATH_MAX];         // Directory for smsd's internal use, concatenation storage files etc.
char d_sent[PATH_MAX];		// Sent spool directory
char d_sent_copy[PATH_MAX];	// 3.1.17.
char d_checked[PATH_MAX];	// Spool directory for checked messages (only used when no provider queues used)
char eventhandler[PATH_MAX];	// Global event handler program or script
char alarmhandler[PATH_MAX];	// Global alarm handler program or script
char checkhandler[PATH_MAX];    // Handler that checks if the sms file is valid.
int alarmlevel;			// Alarm Level (9=highest). Verbosity of alarm handler.
char logfile[PATH_MAX];		// Name or Handle of Log File
int  loglevel;			// Log Level (9=highest). Verbosity of log file.
_queue queues[NUMBER_OF_MODEMS]; // Queues
_device devices[NUMBER_OF_MODEMS]; // Modem devices
int delaytime;			// sleep-time after workless
int delaytime_mainprocess;      // sleep-time after workless, main process. If -1, delaytime is used.
int blocktime;			// sleep-time after multiple errors
int blockafter;                 // Block modem after n errors
int errorsleeptime;		// sleep-time after each error
int autosplit;			// Splitting of large text messages 0=no, 1=yes 2=number with text, 3=number with UDH
int receive_before_send;	// if 1 smsd tries to receive one message before sending
int store_received_pdu;         // 0=no, 1=unsupported pdu's only, 2=unsupported and 8bit/unicode, 3=all
int store_sent_pdu;             // 0=no, 1=failed pdu's only, 2=failed and 8bit/unicode, 3=all
int validity_period;            // Validity period for messages.
int decode_unicode_text;        // 1 if unicode text is decoded internally.
int internal_combine;           // 1 if multipart message is combined internally.
int internal_combine_binary;    // 1 if multipart binary message is combined internally. Defaults to internal_combine.
int keep_filename;              // 0 if unique filename is created to each directory when a message file is moved.
int store_original_filename;    // 1 if an original filename is saved to message file when it's moved from
                                // outgoing directory to spooler. Works together with keep_filename.
int date_filename;              // 1 or 2 if YYYYMMDD is included to the filename of incoming message.
char regular_run[PATH_MAX];     // Script/program which is run regularly.
int regular_run_interval;       // Number of seconds between running a regular_run script/progdam.
char admin_to[SIZE_TO];         // Destination number for administrative messages.
int filename_preview;           // Number of chars of message text to concatenate to filename.
int incoming_utf8;              // 1 if incoming files are saved using UTF-8 character set.
int outgoing_utf8;              // 1 if outgoing files are automatically converted from UTF-8 to ISO and GSM.
int log_charconv;               // 1 if character set conversion is logged.
int log_single_lines;           // 1 if linefeeds are removed from the modem response to be logged.
int executable_check;           // 0 if eventhandler and other executables are NOT checked during the startup checking.
int keep_messages;              // For testing purposes: messages are not deleted and smsd stops after first run.
char priviledged_numbers[SIZE_PRIVILEDGED_NUMBERS]; // Priviledged numbers in incoming messages.
int ic_purge_hours;             // If internal_combine is used, concatenation storage is checked every ic_purge_interval minutes
int ic_purge_minutes;           // and if there is message parts older than defined, they are handled or deleted.
int ic_purge_read;              // 1 = message parts are stored as single messages. 0 = parts are just deleted.
int ic_purge_interval;          //
char shell[PATH_MAX];           // Shell used to run eventhandler, defaults to /bin/sh
char adminmessage_device[32];   // Name of device used to send administrative messages of mainspooler.
int smart_logging;              // 1 = if loglevel is less than 7, degug log is written is there has been any errors.
int status_signal_quality;      // 1 = signal quality is written to status file.
int status_include_counters;    // 1 = succeeded, failed and received counters are included in the status line.
int status_include_uptime;      // 3.1.16beta: 1 = include started & uptime line in the status file.
int hangup_incoming_call;       // 1 = if detected unexpected input contains RING and we want to end call.
int max_continuous_sending;     // Defines when sending is breaked to do check/do other tasks. Time in minutes.
int voicecall_hangup_ath;       // If ATH is used instead of AT+CHUP.

// 3.1.5:
int trust_outgoing;             // 1 = it's _sure_ that files are created by rename AND permissions are correct. Speeds up spooling.

// 3.1.5:
int ignore_outgoing_priority;   // 1 = Priority: high header is not checked. Speeds up spooling.

// 3.1.7:
int ignore_exec_output;         // 1 = stdout and stderr of eventhandlers is _not_ checked.

// 3.1.7:
mode_t conf_umask;              // File mode creation mask for smsd and modem processes.

// 3.1.7:
int trim_text;                  // 1 = trailing whitespaces are removed from text:

// 3.1.7:
int use_linux_ps_trick;         // 1 = change argv[0] to "smsd: MAINPROCESS", "smsd: GSM1" etc.

// 3.1.7:
int log_unmodified;

// 3.1.7:
char suspend_filename[PATH_MAX];

// 3.1.9:
int spool_directory_order;

// 3.1.9: 1 if read_from_modem is logged.
int log_read_from_modem;

// 3.1.16beta2: log_read_timing for performance tuning.
int log_read_timing;

// 3.1.16beta:
int log_response_time;

// 3.1.16beta2:
int default_alphabet;

// 3.1.17: Child process for the mainprocess:
char mainprocess_child[PATH_MAX];
char mainprocess_child_args[PATH_MAX];

// 3.1.17: Notifier for the mainprocess:
int mainprocess_notifier;

// 3.1.17: If *_copy was made, evenhandler can use it instead of original file:
int eventhandler_use_copy;

// 3.1.17: This defines how long to sleep while looping:
int sleeptime_mainprocess;

// 3.1.17: Defines how often PID is checked to detect if another smsd is running:
int check_pid_interval;

// 3.1.18: start script/program for mainprocess:
char mainprocess_start[PATH_MAX];
char mainprocess_start_args[PATH_MAX];

int message_count;              // Counter for sent messages. Multipart message is one message.

volatile sig_atomic_t break_workless_delay; // To break the delay when SIGCONT is received.
volatile sig_atomic_t terminate; // To terminate when SIGTERM is received.

char username[65];              // user and group name which are used to run.
char groupname[65];             // (max length is just a guess)

char infofile[PATH_MAX];        // Hepler file for stopping the smsd smoothly.
char pidfile[PATH_MAX];         // File where a process id is stored.

// Command line arguments:
char arg_username[65];
char arg_groupname[65];
char arg_infofile[PATH_MAX];
char arg_pidfile[PATH_MAX];
char arg_logfile[PATH_MAX];
int arg_terminal;
// 3.1.7:
char arg_7bit_packed[512];
int do_encode_decode_arg_7bit_packed;

int terminal;                   // 1 if smsd is communicating with terminal.
pid_t device_pids[NUMBER_OF_MODEMS]; // Pid's of modem processes.
char run_info[PATH_MAX];        // Information about external script/program execution.

char communicate[32];           // Device name for terminal communication mode.

char international_prefixes[PATH_MAX +1];
char national_prefixes[PATH_MAX +1];

// Storage for startup errors:
char *startup_err_str;
int startup_err_count;

// Storage for PDU's:
char *incoming_pdu_store;
char *outgoing_pdu_store;
char *routed_pdu_store;

// Storage for getfile errors:
char *getfile_err_store;

// Text buffer for error messages:
char tb[SIZE_TB];

// Buffer for SIM memory checking:
char *check_memory_buffer;
size_t check_memory_buffer_size;

int os_cygwin;                  // 1 if we are on Cygwin.

char language_file[PATH_MAX];   // File name of translated headers.
char yes_chars[SIZE_HEADER];    // Characters which mean "yes" in the yesno() question.
char no_chars[SIZE_HEADER];     // See details inside read_translation() function.
char yes_word[SIZE_HEADER];     // "yes" printed as an output.
char no_word[SIZE_HEADER];      // "no"
char datetime_format[SIZE_HEADER]; // strftime format string for time stamps (not inside status reports).
char logtime_format[SIZE_HEADER]; // 3.1.7: strftime format string for logging time stamps
char date_filename_format[SIZE_HEADER]; // 3.1.7: strftime format string for date_filename
int translate_incoming;         // 0 if incoming message headers are NOT transtaled.

// 3.1.14:
int logtime_us;
int logtime_ms;

// 3.1.14:
int shell_test;

// Next two are for debugging purposes:
int enable_smsd_debug;
char smsd_debug[SIZE_SMSD_DEBUG]; // Header of an outgoing message file.

// 3.1.20: Alt keys in communication mode:
#define COMMUNICATE_A_KEY_COUNT 10
char communicate_a_keys[COMMUNICATE_A_KEY_COUNT][256];

char *msg_dir = "%s directory %s cannot be opened.";
char *msg_file = "%s directory %s is not writable.";
char *msg_not_executable = "is not executable for smsd.";




#include "smsd_cfg.h"
#include "stats.h"


// 3.1.16beta2: Moved logch() and prch() from charset.c to logging.c:
char logch_buffer[8192];

char prch(char ch);

// 3.1.16beta: changed type:
//int trouble_logging_started;
time_t trouble_logging_started;

int Filehandle = -1;
int Level;
int SavedLevel;




#include <time.h>

// 3.1.16beta2: Moved logch() and prch() from charset.c to logging.c:
extern char logch_buffer[8192];

#ifdef __GNUC__
void logch(char* format, ...) __attribute__ ((format(printf, 1, 2)));

void logch(char* format, ...);
#endif

extern char prch(char ch);

// 3.1.16beta: changed type:
//int trouble_logging_started;
extern time_t trouble_logging_started;

int change_loglevel(int new_level);
void restore_loglevel();




#include <mm.h>
#endif


_stats* statistics[NUMBER_OF_MODEMS]; // Statistic data (shared memory!)
int rejected_counter;		// Statistic counter, rejected SM, number does not fit into any queue
time_t start_time;		// Start time of smsd, allows statistic functions
int printstatus;		// if 1 smsd outputs status on stdout
time_t last_stats;		// time when the last stats file was created
char d_stats[PATH_MAX];		// path to statistic files
int stats_interval;		// time between statistic files in seconds.
int stats_no_zeroes;		// Suppress files that contain only zeroes
int status_interval;            // time between updating status file in seconds

char *shared_buffer;


char newstatus[NUMBER_OF_MODEMS +1] = {0};
char oldstatus[NUMBER_OF_MODEMS +1] = {0};





  int ber;
} _stats;

extern _stats* statistics[NUMBER_OF_MODEMS]; // Statistic data (shared memory!)
extern int rejected_counter;		// Statistic counter, rejected SM, number does not fit into any queue
extern time_t start_time;		// Start time of smsd, allows statistic functions
extern int printstatus;		// if 1 smsd outputs status on stdout
extern time_t last_stats;		// time when the last stats file was created
extern char d_stats[PATH_MAX];		// path to statistic files
extern int stats_interval;		// time between statistic files in seconds.
extern int stats_no_zeroes;		// Suppress files that contain only zeroes
extern int status_interval;            // time between updating status file in seconds

extern char *shared_buffer;

/* Creates shared memory variables for statistic data */


Lines 23-28 Link Here

(-)smstools.orig/src/blacklist.c (+2 lines)
23	#include "alarm.h"	23	#include "alarm.h"
24	#include "smsd_cfg.h"	24	#include "smsd_cfg.h"
25		25
		26	char blacklist[256]; // Filename of the black-list
		27
26	int inblacklist(char* msisdn)	28	int inblacklist(char* msisdn)
27	{	29	{
28	FILE* file;	30	FILE* file;

Lines 15-21 Link Here

(-)smstools.orig/src/blacklist.h (-1 / +1 lines)
15	#ifndef BLACK_H	15	#ifndef BLACK_H
16	#define BLACK_H	16	#define BLACK_H
17		17
18	char blacklist[256]; // Filename of the black-list	18	extern char blacklist[256]; // Filename of the black-list
19		19
20	int inblacklist(char* msisdn);	20	int inblacklist(char* msisdn);
21		21

Lines 23-28 Link Here

(-)smstools.orig/src/whitelist.c (+2 lines)
23	#include "alarm.h"	23	#include "alarm.h"
24	#include "smsd_cfg.h"	24	#include "smsd_cfg.h"
25		25
		26	char whitelist[256]; // Filename of the white-list
		27
26	/* Used with >= 3.1x */	28	/* Used with >= 3.1x */
27	int inwhitelist_q(char* msisdn, char *queuename)	29	int inwhitelist_q(char* msisdn, char *queuename)
28	{	30	{

Lines 15-21 Link Here

(-)smstools.orig/src/whitelist.h (-1 / +1 lines)
15	#ifndef WHITE_H	15	#ifndef WHITE_H
16	#define WHITE_H	16	#define WHITE_H
17		17
18	char whitelist[256]; // Filename of the white-list	18	extern char whitelist[256]; // Filename of the white-list
19		19
20	/* Used with >= 3.1x */	20	/* Used with >= 3.1x */
21	int inwhitelist_q(char* msisdn, char *queuename);	21	int inwhitelist_q(char* msisdn, char *queuename);

Return to bug 708512

Lines 33-49 Link Here

(-)smstools.orig/src/stats.h (-10 / +10 lines)
33	int ber;	33	int ber;
34	} _stats;	34	} _stats;
35		35
36	_stats* statistics[NUMBER_OF_MODEMS]; // Statistic data (shared memory!)	36	extern _stats* statistics[NUMBER_OF_MODEMS]; // Statistic data (shared memory!)
37	int rejected_counter; // Statistic counter, rejected SM, number does not fit into any queue	37	extern int rejected_counter; // Statistic counter, rejected SM, number does not fit into any queue
38	time_t start_time; // Start time of smsd, allows statistic functions	38	extern time_t start_time; // Start time of smsd, allows statistic functions
39	int printstatus; // if 1 smsd outputs status on stdout	39	extern int printstatus; // if 1 smsd outputs status on stdout
40	time_t last_stats; // time when the last stats file was created	40	extern time_t last_stats; // time when the last stats file was created
41	char d_stats[PATH_MAX]; // path to statistic files	41	extern char d_stats[PATH_MAX]; // path to statistic files
42	int stats_interval; // time between statistic files in seconds.	42	extern int stats_interval; // time between statistic files in seconds.
43	int stats_no_zeroes; // Suppress files that contain only zeroes	43	extern int stats_no_zeroes; // Suppress files that contain only zeroes
44	int status_interval; // time between updating status file in seconds	44	extern int status_interval; // time between updating status file in seconds
45		45
46	char *shared_buffer;	46	extern char *shared_buffer;
47		47
48	/* Creates shared memory variables for statistic data */	48	/* Creates shared memory variables for statistic data */
49		49

Lines 38-43 Link Here

(-)smstools.orig/src/smsd_cfg.c (+215 lines)
38	#include "modeminit.h"	38	#include "modeminit.h"
39	#include "charshift.h"	39	#include "charshift.h"
40		40
		41
		42	/* global variables */
		43	char process_title[32]; // smsd for main task, NOTIFIER or CHILD, name of a modem for other tasks.
		44	int process_id; // -1 for main task, all modems have numbers starting with 0.
		45	// This is the same as device, can be used like devices[process_id] if IS_MODEM_PROCESS.
		46
		47	time_t process_start_time;
		48
		49	int modem_handle; // Handle for modem.
		50
		51	int put_command_timeouts;
		52	unsigned long long put_command_sent; // 3.1.16beta.
		53	char tmpdir[PATH_MAX]; // 3.1.16beta.
		54
		55	// NOTE for regular run intervals: effective value is at least delaytime.
		56
		57	char configfile[PATH_MAX]; // Path to config file
		58	char d_spool[PATH_MAX]; // Spool directory
		59	char d_failed[PATH_MAX]; // Failed spool directory
		60	char d_failed_copy[PATH_MAX]; // 3.1.17.
		61	char d_incoming[PATH_MAX]; // Incoming spool directory
		62	char d_incoming_copy[PATH_MAX]; // 3.1.16beta2.
		63	char d_report[PATH_MAX]; // Incoming report spool directory
		64	char d_report_copy[PATH_MAX]; // 3.1.17.
		65	char d_phonecalls[PATH_MAX]; // Incoming phonecalls data directory
		66	char d_saved[PATH_MAX]; // Directory for smsd's internal use, concatenation storage files etc.
		67	char d_sent[PATH_MAX]; // Sent spool directory
		68	char d_sent_copy[PATH_MAX]; // 3.1.17.
		69	char d_checked[PATH_MAX]; // Spool directory for checked messages (only used when no provider queues used)
		70	char eventhandler[PATH_MAX]; // Global event handler program or script
		71	char alarmhandler[PATH_MAX]; // Global alarm handler program or script
		72	char checkhandler[PATH_MAX]; // Handler that checks if the sms file is valid.
		73	int alarmlevel; // Alarm Level (9=highest). Verbosity of alarm handler.
		74	char logfile[PATH_MAX]; // Name or Handle of Log File
		75	int loglevel; // Log Level (9=highest). Verbosity of log file.
		76	_queue queues[NUMBER_OF_MODEMS]; // Queues
		77	_device devices[NUMBER_OF_MODEMS]; // Modem devices
		78	int delaytime; // sleep-time after workless
		79	int delaytime_mainprocess; // sleep-time after workless, main process. If -1, delaytime is used.
		80	int blocktime; // sleep-time after multiple errors
		81	int blockafter; // Block modem after n errors
		82	int errorsleeptime; // sleep-time after each error
		83	int autosplit; // Splitting of large text messages 0=no, 1=yes 2=number with text, 3=number with UDH
		84	int receive_before_send; // if 1 smsd tries to receive one message before sending
		85	int store_received_pdu; // 0=no, 1=unsupported pdu's only, 2=unsupported and 8bit/unicode, 3=all
		86	int store_sent_pdu; // 0=no, 1=failed pdu's only, 2=failed and 8bit/unicode, 3=all
		87	int validity_period; // Validity period for messages.
		88	int decode_unicode_text; // 1 if unicode text is decoded internally.
		89	int internal_combine; // 1 if multipart message is combined internally.
		90	int internal_combine_binary; // 1 if multipart binary message is combined internally. Defaults to internal_combine.
		91	int keep_filename; // 0 if unique filename is created to each directory when a message file is moved.
		92	int store_original_filename; // 1 if an original filename is saved to message file when it's moved from
		93	// outgoing directory to spooler. Works together with keep_filename.
		94	int date_filename; // 1 or 2 if YYYYMMDD is included to the filename of incoming message.
		95	char regular_run[PATH_MAX]; // Script/program which is run regularly.
		96	int regular_run_interval; // Number of seconds between running a regular_run script/progdam.
		97	char admin_to[SIZE_TO]; // Destination number for administrative messages.
		98	int filename_preview; // Number of chars of message text to concatenate to filename.
		99	int incoming_utf8; // 1 if incoming files are saved using UTF-8 character set.
		100	int outgoing_utf8; // 1 if outgoing files are automatically converted from UTF-8 to ISO and GSM.
		101	int log_charconv; // 1 if character set conversion is logged.
		102	int log_single_lines; // 1 if linefeeds are removed from the modem response to be logged.
		103	int executable_check; // 0 if eventhandler and other executables are NOT checked during the startup checking.
		104	int keep_messages; // For testing purposes: messages are not deleted and smsd stops after first run.
105	char priviledged_numbers[SIZE_PRIVILEDGED_NUMBERS]; // Priviledged numbers in incoming messages.
106	int ic_purge_hours; // If internal_combine is used, concatenation storage is checked every ic_purge_interval minutes
107	int ic_purge_minutes; // and if there is message parts older than defined, they are handled or deleted.
108	int ic_purge_read; // 1 = message parts are stored as single messages. 0 = parts are just deleted.
109	int ic_purge_interval; //
110	char shell[PATH_MAX]; // Shell used to run eventhandler, defaults to /bin/sh
111	char adminmessage_device[32]; // Name of device used to send administrative messages of mainspooler.
112	int smart_logging; // 1 = if loglevel is less than 7, degug log is written is there has been any errors.
113	int status_signal_quality; // 1 = signal quality is written to status file.
114	int status_include_counters; // 1 = succeeded, failed and received counters are included in the status line.
115	int status_include_uptime; // 3.1.16beta: 1 = include started & uptime line in the status file.
116	int hangup_incoming_call; // 1 = if detected unexpected input contains RING and we want to end call.
117	int max_continuous_sending; // Defines when sending is breaked to do check/do other tasks. Time in minutes.
118	int voicecall_hangup_ath; // If ATH is used instead of AT+CHUP.
119
120	// 3.1.5:
121	int trust_outgoing; // 1 = it's _sure_ that files are created by rename AND permissions are correct. Speeds up spooling.
122
123	// 3.1.5:
124	int ignore_outgoing_priority; // 1 = Priority: high header is not checked. Speeds up spooling.
125
126	// 3.1.7:
127	int ignore_exec_output; // 1 = stdout and stderr of eventhandlers is _not_ checked.
128
129	// 3.1.7:
130	mode_t conf_umask; // File mode creation mask for smsd and modem processes.
131
132	// 3.1.7:
133	int trim_text; // 1 = trailing whitespaces are removed from text:
134
135	// 3.1.7:
136	int use_linux_ps_trick; // 1 = change argv[0] to "smsd: MAINPROCESS", "smsd: GSM1" etc.
137
138	// 3.1.7:
139	int log_unmodified;
140
141	// 3.1.7:
142	char suspend_filename[PATH_MAX];
143
144	// 3.1.9:
145	int spool_directory_order;
146
147	// 3.1.9: 1 if read_from_modem is logged.
148	int log_read_from_modem;
149
150	// 3.1.16beta2: log_read_timing for performance tuning.
151	int log_read_timing;
152
153	// 3.1.16beta:
154	int log_response_time;
155
156	// 3.1.16beta2:
157	int default_alphabet;
158
159	// 3.1.17: Child process for the mainprocess:
160	char mainprocess_child[PATH_MAX];
161	char mainprocess_child_args[PATH_MAX];
162
163	// 3.1.17: Notifier for the mainprocess:
164	int mainprocess_notifier;
165
166	// 3.1.17: If *_copy was made, evenhandler can use it instead of original file:
167	int eventhandler_use_copy;
168
169	// 3.1.17: This defines how long to sleep while looping:
170	int sleeptime_mainprocess;
171
172	// 3.1.17: Defines how often PID is checked to detect if another smsd is running:
173	int check_pid_interval;
174
175	// 3.1.18: start script/program for mainprocess:
176	char mainprocess_start[PATH_MAX];
177	char mainprocess_start_args[PATH_MAX];
178
179	int message_count; // Counter for sent messages. Multipart message is one message.
180
181	volatile sig_atomic_t break_workless_delay; // To break the delay when SIGCONT is received.
182	volatile sig_atomic_t terminate; // To terminate when SIGTERM is received.
183
184	char username[65]; // user and group name which are used to run.
185	char groupname[65]; // (max length is just a guess)
186
187	char infofile[PATH_MAX]; // Hepler file for stopping the smsd smoothly.
188	char pidfile[PATH_MAX]; // File where a process id is stored.
189
190	// Command line arguments:
191	char arg_username[65];
192	char arg_groupname[65];
193	char arg_infofile[PATH_MAX];
194	char arg_pidfile[PATH_MAX];
195	char arg_logfile[PATH_MAX];
196	int arg_terminal;
197	// 3.1.7:
198	char arg_7bit_packed[512];
199	int do_encode_decode_arg_7bit_packed;
200
201	int terminal; // 1 if smsd is communicating with terminal.
202	pid_t device_pids[NUMBER_OF_MODEMS]; // Pid's of modem processes.
203	char run_info[PATH_MAX]; // Information about external script/program execution.
204
205	char communicate[32]; // Device name for terminal communication mode.
206
207	char international_prefixes[PATH_MAX +1];
208	char national_prefixes[PATH_MAX +1];
209
210	// Storage for startup errors:
211	char *startup_err_str;
212	int startup_err_count;
213
214	// Storage for PDU's:
215	char *incoming_pdu_store;
216	char *outgoing_pdu_store;
217	char *routed_pdu_store;
218
219	// Storage for getfile errors:
220	char *getfile_err_store;
221
222	// Text buffer for error messages:
223	char tb[SIZE_TB];
224
225	// Buffer for SIM memory checking:
226	char *check_memory_buffer;
227	size_t check_memory_buffer_size;
228
229	int os_cygwin; // 1 if we are on Cygwin.
230
231	char language_file[PATH_MAX]; // File name of translated headers.
232	char yes_chars[SIZE_HEADER]; // Characters which mean "yes" in the yesno() question.
233	char no_chars[SIZE_HEADER]; // See details inside read_translation() function.
234	char yes_word[SIZE_HEADER]; // "yes" printed as an output.
235	char no_word[SIZE_HEADER]; // "no"
236	char datetime_format[SIZE_HEADER]; // strftime format string for time stamps (not inside status reports).
237	char logtime_format[SIZE_HEADER]; // 3.1.7: strftime format string for logging time stamps
238	char date_filename_format[SIZE_HEADER]; // 3.1.7: strftime format string for date_filename
239	int translate_incoming; // 0 if incoming message headers are NOT transtaled.
240
241	// 3.1.14:
242	int logtime_us;
243	int logtime_ms;
244
245	// 3.1.14:
246	int shell_test;
247
248	// Next two are for debugging purposes:
249	int enable_smsd_debug;
250	char smsd_debug[SIZE_SMSD_DEBUG]; // Header of an outgoing message file.
251
252	// 3.1.20: Alt keys in communication mode:
253	#define COMMUNICATE_A_KEY_COUNT 10
254	char communicate_a_keys[COMMUNICATE_A_KEY_COUNT][256];
255
41	char *msg_dir = "%s directory %s cannot be opened.";	256	char *msg_dir = "%s directory %s cannot be opened.";
42	char *msg_file = "%s directory %s is not writable.";	257	char *msg_file = "%s directory %s is not writable.";
43	char *msg_not_executable = "is not executable for smsd.";	258	char *msg_not_executable = "is not executable for smsd.";

Lines 25-30 Link Here

(-)smstools.orig/src/logging.c (+10 lines)
25	#include "smsd_cfg.h"	25	#include "smsd_cfg.h"
26	#include "stats.h"	26	#include "stats.h"
27		27
		28
		29	// 3.1.16beta2: Moved logch() and prch() from charset.c to logging.c:
		30	char logch_buffer[8192];
		31
		32	char prch(char ch);
		33
		34	// 3.1.16beta: changed type:
		35	//int trouble_logging_started;
		36	time_t trouble_logging_started;
		37
28	int Filehandle = -1;	38	int Filehandle = -1;
29	int Level;	39	int Level;
30	int SavedLevel;	40	int SavedLevel;

Lines 18-24 Link Here

(-)smstools.orig/src/logging.h (-3 / +3 lines)
18	#include <time.h>	18	#include <time.h>
19		19
20	// 3.1.16beta2: Moved logch() and prch() from charset.c to logging.c:	20	// 3.1.16beta2: Moved logch() and prch() from charset.c to logging.c:
21	char logch_buffer[8192];	21	extern char logch_buffer[8192];
22		22
23	#ifdef __GNUC__	23	#ifdef __GNUC__
24	void logch(char* format, ...) __attribute__ ((format(printf, 1, 2)));	24	void logch(char* format, ...) __attribute__ ((format(printf, 1, 2)));
Lines 26-36 Link Here
26	void logch(char* format, ...);	26	void logch(char* format, ...);
27	#endif	27	#endif
28		28
29	char prch(char ch);	29	extern char prch(char ch);
30		30
31	// 3.1.16beta: changed type:	31	// 3.1.16beta: changed type:
32	//int trouble_logging_started;	32	//int trouble_logging_started;
33	time_t trouble_logging_started;	33	extern time_t trouble_logging_started;
34		34
35	int change_loglevel(int new_level);	35	int change_loglevel(int new_level);
36	void restore_loglevel();	36	void restore_loglevel();

Lines 29-34 Link Here

(-)smstools.orig/src/stats.c (+14 lines)
29	#include <mm.h>	29	#include <mm.h>
30	#endif	30	#endif
31		31
		32
		33	_stats* statistics[NUMBER_OF_MODEMS]; // Statistic data (shared memory!)
		34	int rejected_counter; // Statistic counter, rejected SM, number does not fit into any queue
		35	time_t start_time; // Start time of smsd, allows statistic functions
		36	int printstatus; // if 1 smsd outputs status on stdout
		37	time_t last_stats; // time when the last stats file was created
		38	char d_stats[PATH_MAX]; // path to statistic files
		39	int stats_interval; // time between statistic files in seconds.
		40	int stats_no_zeroes; // Suppress files that contain only zeroes
		41	int status_interval; // time between updating status file in seconds
		42
		43	char *shared_buffer;
		44
		45
32	char newstatus[NUMBER_OF_MODEMS +1] = {0};	46	char newstatus[NUMBER_OF_MODEMS +1] = {0};
33	char oldstatus[NUMBER_OF_MODEMS +1] = {0};	47	char oldstatus[NUMBER_OF_MODEMS +1] = {0};
34		48