DeforaOS/Phone
DeforaOS/Phone
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hopefully fixed reading messages in PDU mode (the phone number is still wrong)

Browse Source
This commit is contained in:
Pierre Pronchery 2010-05-27 16:26:19 +00:00
parent 05d13c3fa6
commit b83ab8c414
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gsm.c
View File

@ -34,6 +34,8 @@
#define _(string) gettext(string) #define _(string) gettext(string)
#define N_(string) (string) #define N_(string) (string)
#define min(a, b) ((a) < (b) ? (a) : (b))
/* GSM */ /* GSM */
/* private */ /* private */
@ -1372,7 +1374,8 @@ static int _gsm_trigger_cmgl(GSM * gsm, char const * result)
/* gsm_trigger_cmgr */ /* gsm_trigger_cmgr */
static unsigned char * _cmgr_pdu_parse(char const * pdu, time_t * timestamp); static char * _cmgr_pdu_parse(char const * pdu, time_t * timestamp,
char number[32]);
static time_t _cmgr_pdu_parse_timestamp(char const * timestamp); static time_t _cmgr_pdu_parse_timestamp(char const * timestamp);
static int _gsm_trigger_cmgr(GSM * gsm, char const * result) static int _gsm_trigger_cmgr(GSM * gsm, char const * result)
@ -1383,7 +1386,8 @@ static int _gsm_trigger_cmgr(GSM * gsm, char const * result)
unsigned int alpha = 0; unsigned int alpha = 0;
unsigned int * length = &gsm->event.message.length; unsigned int * length = &gsm->event.message.length;
struct tm t; struct tm t;
unsigned char * p; char * p;
char * q;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s(\"%s\")\n", __func__, result); fprintf(stderr, "DEBUG: %s(\"%s\")\n", __func__, result);
@ -1414,11 +1418,18 @@ static int _gsm_trigger_cmgr(GSM * gsm, char const * result)
*length = strlen(result); *length = strlen(result);
_gsm_event_send(gsm, GSM_EVENT_TYPE_MESSAGE); _gsm_event_send(gsm, GSM_EVENT_TYPE_MESSAGE);
} }
else if((p = _cmgr_pdu_parse(result, &gsm->event.message.date)) != NULL) else if((p = _cmgr_pdu_parse(result, &gsm->event.message.date,
gsm->number)) != NULL)
{ {
gsm->event.message.number = NULL; /* FIXME implement */ if((q = g_convert(p, -1, "UTF-8", "ISO-8859-1", NULL, NULL,
gsm->event.message.content = (char *)p; NULL)) != NULL)
*length = strlen(result); /* XXX should not be necessary */ {
free(p);
p = q;
}
*length = strlen(p); /* XXX should not be necessary */
gsm->event.message.number = gsm->number; /* XXX ugly */
gsm->event.message.content = p;
_gsm_event_send(gsm, GSM_EVENT_TYPE_MESSAGE); _gsm_event_send(gsm, GSM_EVENT_TYPE_MESSAGE);
free(p); free(p);
} }
@ -1426,7 +1437,8 @@ static int _gsm_trigger_cmgr(GSM * gsm, char const * result)
} }
/* XXX this function is fat and ugly */ /* XXX this function is fat and ugly */
static unsigned char * _cmgr_pdu_parse(char const * pdu, time_t * timestamp) static char * _cmgr_pdu_parse(char const * pdu, time_t * timestamp,
char number[32])
{ {
size_t len; size_t len;
unsigned int smscl; unsigned int smscl;
@ -1471,6 +1483,8 @@ static unsigned char * _cmgr_pdu_parse(char const * pdu, time_t * timestamp)
addrl++; addrl++;
if((smscl * 2) + 2 + 4 + addrl + 2 > len) if((smscl * 2) + 2 + 4 + addrl + 2 > len)
return NULL; return NULL;
/* FIXME actually parse the number */
snprintf(number, min(addrl + 1, sizeof(number)), "%s", q + 2);
q = pdu + (smscl * 2) + 2 + 4 + addrl + 2; q = pdu + (smscl * 2) + 2 + 4 + addrl + 2;
if(sscanf(q, "%02X", &pid) != 1) /* PID */ if(sscanf(q, "%02X", &pid) != 1) /* PID */
return NULL; return NULL;
@ -1517,7 +1531,7 @@ static unsigned char * _cmgr_pdu_parse(char const * pdu, time_t * timestamp)
} }
} }
p[j] = '\0'; p[j] = '\0';
return p; return (char *)p;
} }
static time_t _cmgr_pdu_parse_timestamp(char const * timestamp) static time_t _cmgr_pdu_parse_timestamp(char const * timestamp)