summaryrefslogtreecommitdiff
path: root/smsd/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'smsd/core.c')
-rw-r--r--smsd/core.c85
1 files changed, 72 insertions, 13 deletions
diff --git a/smsd/core.c b/smsd/core.c
index b308d42..76607ed 100644
--- a/smsd/core.c
+++ b/smsd/core.c
@@ -543,6 +543,9 @@ GSM_Error SMSD_LoadNumbersFile(GSM_SMSDConfig *Config, GSM_StringArray *Array, c
GSM_Error SMSD_ConfigureLogging(GSM_SMSDConfig *Config, gboolean uselog)
{
int fd;
+#ifdef HAVE_SYSLOG
+ int facility;
+#endif
/* No logging configured */
if (Config->logfilename == NULL) {
@@ -566,8 +569,34 @@ GSM_Error SMSD_ConfigureLogging(GSM_SMSDConfig *Config, gboolean uselog)
#endif
#ifdef HAVE_SYSLOG
} else if (strcmp(Config->logfilename, "syslog") == 0) {
+ if (Config->logfacility == NULL) {
+ facility = LOG_DAEMON;
+ } else if (strcasecmp(Config->logfacility, "DAEMON")) {
+ facility = LOG_DAEMON;
+ } else if (strcasecmp(Config->logfacility, "USER")) {
+ facility = LOG_USER;
+ } else if (strcasecmp(Config->logfacility, "LOCAL0")) {
+ facility = LOG_LOCAL0;
+ } else if (strcasecmp(Config->logfacility, "LOCAL1")) {
+ facility = LOG_LOCAL1;
+ } else if (strcasecmp(Config->logfacility, "LOCAL2")) {
+ facility = LOG_LOCAL2;
+ } else if (strcasecmp(Config->logfacility, "LOCAL3")) {
+ facility = LOG_LOCAL3;
+ } else if (strcasecmp(Config->logfacility, "LOCAL4")) {
+ facility = LOG_LOCAL4;
+ } else if (strcasecmp(Config->logfacility, "LOCAL5")) {
+ facility = LOG_LOCAL5;
+ } else if (strcasecmp(Config->logfacility, "LOCAL6")) {
+ facility = LOG_LOCAL6;
+ } else if (strcasecmp(Config->logfacility, "LOCAL7")) {
+ facility = LOG_LOCAL7;
+ } else {
+ fprintf(stderr, "Invalid facility \"%s\"\n", Config->logfacility);
+ facility = LOG_DAEMON;
+ }
Config->log_type = SMSD_LOG_SYSLOG;
- openlog(Config->program_name, LOG_PID, LOG_DAEMON);
+ openlog(Config->program_name, LOG_PID, facility);
Config->use_stderr = TRUE;
#endif
} else {
@@ -632,6 +661,7 @@ GSM_Error SMSD_ReadConfig(const char *filename, GSM_SMSDConfig *Config, gboolean
Config->gammu_log_buffer = NULL;
Config->gammu_log_buffer_size = 0;
Config->logfilename = NULL;
+ Config->logfacility = NULL;
Config->smsdcfgfile = NULL;
Config->use_timestamps = TRUE;
Config->log_type = SMSD_LOG_NONE;
@@ -677,7 +707,9 @@ GSM_Error SMSD_ReadConfig(const char *filename, GSM_SMSDConfig *Config, gboolean
Config->debug_level = 0;
}
- Config->logfilename=INI_GetValue(Config->smsdcfgfile, "smsd", "logfile", FALSE);
+ Config->logfilename = INI_GetValue(Config->smsdcfgfile, "smsd", "logfile", FALSE);
+ Config->logfacility = INI_GetValue(Config->smsdcfgfile, "smsd", "logfacility", FALSE);
+
error = SMSD_ConfigureLogging(Config, uselog);
if (error != ERR_NONE) {
return error;
@@ -772,7 +804,7 @@ GSM_Error SMSD_ReadConfig(const char *filename, GSM_SMSDConfig *Config, gboolean
str = INI_GetValue(Config->smsdcfgfile, "smsd", "smsc", FALSE);
if (str) {
- Config->SMSC.Location = 1;
+ Config->SMSC.Location = 0;
Config->SMSC.DefaultNumber[0] = 0;
Config->SMSC.DefaultNumber[1] = 0;
Config->SMSC.Name[0] = 0;
@@ -781,9 +813,12 @@ GSM_Error SMSD_ReadConfig(const char *filename, GSM_SMSDConfig *Config, gboolean
Config->SMSC.Format = SMS_FORMAT_Text;
EncodeUnicode(Config->SMSC.Number, str, strlen(str));
} else {
- Config->SMSC.Location = 0;
+ Config->SMSC.Location = -1;
}
+ /* Clear cache */
+ Config->SMSCCache.Location = 0;
+
/* Read service specific configuration */
error = Config->Service->ReadConfiguration(Config);
if (error != ERR_NONE) return error;
@@ -844,7 +879,7 @@ GSM_Error SMSD_ReadConfig(const char *filename, GSM_SMSDConfig *Config, gboolean
Config->prevSMSID[0] = 0;
Config->relativevalidity = -1;
Config->Status = NULL;
- Config->IncompleteMessageID = 0;
+ Config->IncompleteMessageID = -1;
Config->IncompleteMessageTime = 0;
return ERR_NONE;
@@ -1239,14 +1274,26 @@ GSM_Error SMSD_ProcessSMS(GSM_SMSDConfig *Config, GSM_MultiSMSMessage *sms)
gboolean SMSD_CheckMultipart(GSM_SMSDConfig *Config, GSM_MultiSMSMessage *MultiSMS)
{
gboolean same_id;
+ int current_id;
/* Does the message have UDH (is multipart)? */
if (MultiSMS->SMS[0].UDH.Type == UDH_NoUDH || MultiSMS->SMS[0].UDH.AllParts == -1) {
return TRUE;
}
+ /* Grab current id */
+ if (MultiSMS->SMS[0].UDH.ID16bit != -1) {
+ current_id = MultiSMS->SMS[0].UDH.ID16bit;
+ } else {
+ current_id = MultiSMS->SMS[0].UDH.ID8bit;
+ }
+
/* Do we have same id as last incomplete? */
- same_id = (Config->IncompleteMessageID == MultiSMS->SMS[0].UDH.ID16bit || Config->IncompleteMessageID == MultiSMS->SMS[0].UDH.ID8bit);
+ same_id = (Config->IncompleteMessageID != -1 && Config->IncompleteMessageID == current_id);
+
+ /* Some logging */
+ SMSD_Log(DEBUG_INFO, Config, "Multipart message 0x%02X, %d parts of %d",
+ current_id, MultiSMS->Number, MultiSMS->SMS[0].UDH.AllParts);
/* Check if we have all parts */
if (MultiSMS->SMS[0].UDH.AllParts == MultiSMS->Number) {
@@ -1255,9 +1302,10 @@ gboolean SMSD_CheckMultipart(GSM_SMSDConfig *Config, GSM_MultiSMSMessage *MultiS
/* Have we seen this message recently? */
if (same_id) {
- if (Config->IncompleteMessageTime != 0 && difftime(time(NULL), Config->IncompleteMessageTime) > Config->multiparttimeout) {
+ if (Config->IncompleteMessageTime != 0 && difftime(time(NULL), Config->IncompleteMessageTime) >= Config->multiparttimeout) {
SMSD_Log(DEBUG_INFO, Config, "Incomplete multipart message 0x%02X, processing after timeout",
Config->IncompleteMessageID);
+ Config->IncompleteMessageID = -1;
} else {
SMSD_Log(DEBUG_INFO, Config, "Incomplete multipart message 0x%02X, waiting for other parts (waited %.0f seconds)",
Config->IncompleteMessageID,
@@ -1286,6 +1334,7 @@ success:
/* Clean multipart wait flag */
if (same_id) {
Config->IncompleteMessageTime = 0;
+ Config->IncompleteMessageID = -1;
}
return TRUE;
}
@@ -1493,7 +1542,7 @@ GSM_Error SMSD_SendSMS(GSM_SMSDConfig *Config)
if (error != ERR_NONE) {
/* Unknown error - escape */
SMSD_Log(DEBUG_INFO, Config, "Error in outbox on '%s'", Config->SMSID);
- for (i=0;i<sms.Number;i++) {
+ for (i = 0; i < sms.Number; i++) {
Config->Status->Failed++;
Config->Service->AddSentSMSInfo(&sms, Config, Config->SMSID, i+1, SMSD_SEND_ERROR, -1);
}
@@ -1526,21 +1575,31 @@ GSM_Error SMSD_SendSMS(GSM_SMSDConfig *Config)
}
for (i = 0; i < sms.Number; i++) {
+ if (sms.SMS[i].SMSC.Location == 0 && UnicodeLength(sms.SMS[i].SMSC.Number) == 0 && Config->SMSC.Location == 0) {
+ SMSD_Log(DEBUG_INFO, Config, "Message without SMSC, using configured one");
+ memcpy(&sms.SMS[i].SMSC,&Config->SMSC,sizeof(GSM_SMSC));
+ sms.SMS[i].SMSC.Location = 0;
+ if (Config->relativevalidity != -1) {
+ sms.SMS[i].SMSC.Validity.Format = SMS_Validity_RelativeFormat;
+ sms.SMS[i].SMSC.Validity.Relative = Config->relativevalidity;
+ }
+
+ }
if (sms.SMS[i].SMSC.Location == 0 && UnicodeLength(sms.SMS[i].SMSC.Number) == 0) {
SMSD_Log(DEBUG_INFO, Config, "Message without SMSC, assuming you want to use the one from phone");
sms.SMS[i].SMSC.Location = 1;
}
if (sms.SMS[i].SMSC.Location != 0) {
- if (Config->SMSC.Location != sms.SMS[i].SMSC.Location) {
- Config->SMSC.Location = sms.SMS[i].SMSC.Location;
- error = GSM_GetSMSC(Config->gsm,&Config->SMSC);
+ if (Config->SMSCCache.Location != sms.SMS[i].SMSC.Location) {
+ Config->SMSCCache.Location = sms.SMS[i].SMSC.Location;
+ error = GSM_GetSMSC(Config->gsm,&Config->SMSCCache);
if (error!=ERR_NONE) {
SMSD_Log(DEBUG_ERROR, Config, "Error getting SMSC from phone");
return ERR_UNKNOWN;
}
}
- memcpy(&sms.SMS[i].SMSC,&Config->SMSC,sizeof(GSM_SMSC));
+ memcpy(&sms.SMS[i].SMSC,&Config->SMSCCache,sizeof(GSM_SMSC));
sms.SMS[i].SMSC.Location = 0;
if (Config->relativevalidity != -1) {
sms.SMS[i].SMSC.Validity.Format = SMS_Validity_RelativeFormat;
@@ -1901,7 +1960,7 @@ GSM_Error SMSD_MainLoop(GSM_SMSDConfig *Config, gboolean exit_on_failure, int ma
/* Sleep some time before another loop */
current_time = time(NULL);
- if (Config->loopsleep <= 1) {
+ if (Config->loopsleep == 1) {
sleep(1);
} else if (difftime(current_time, lastloop) < Config->loopsleep) {
sleep(Config->loopsleep - difftime(current_time, lastloop));
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 09:12:57 +0000