yafox
/
minimodem-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

callerid: handle name and phone '[N/A]' or '[blocked]'

This commit is contained in:
Kamal Mostafa 2014-11-08 10:29:59 -08:00
parent a6a7e0da35
commit 8c9484a738
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/databits_callerid.c
View File

@ -74,15 +74,41 @@ decode_mdmf_callerid( char *dataout_p, unsigned int dataout_size )
dataout_n += sprintf(dataout_p+dataout_n, "%-6s ", dataout_n += sprintf(dataout_p+dataout_n, "%-6s ",
cid_datatype_names[cid_datatype]); cid_datatype_names[cid_datatype]);
if ( cid_datatype == CID_DATA_DATETIME ) int prlen = 0;
dataout_n += sprintf(dataout_p+dataout_n, "%.2s/%.2s %.2s:%.2s\n", char *prdata = NULL;
m+0, m+2, m+4, m+6); switch ( cid_datatype ) {
else if ( cid_datatype == CID_DATA_PHONE && cid_datalen == 10 ) case CID_DATA_DATETIME:
dataout_n += sprintf(dataout_p+dataout_n, "%.3s-%.3s-%.4s\n", dataout_n += sprintf(dataout_p+dataout_n,
m+0, m+3, m+6); "%.2s/%.2s %.2s:%.2s\n", m+0, m+2, m+4, m+6);
else break;
dataout_n += sprintf(dataout_p+dataout_n, "%.*s\n", case CID_DATA_PHONE:
cid_datalen, m); if ( cid_datalen == 10 ) {
dataout_n += sprintf(dataout_p+dataout_n,
"%.3s-%.3s-%.4s\n", m+0, m+3, m+6);
break;
} else {
// fallthrough
}
case CID_DATA_NAME:
prdata = (char *)m;
prlen = cid_datalen;
break;
case CID_DATA_PHONE_NA:
case CID_DATA_NAME_NA:
if ( cid_datalen == 1 && *m == 'O' ) {
prdata = "[N/A]";
prlen = 5;
} else if ( cid_datalen == 1 && *m == 'P' ) {
prdata = "[blocked]";
prlen = 9;
}
break;
default:
// FIXME: warning here?
break;
}
if ( prdata )
dataout_n += sprintf(dataout_p+dataout_n, "%.*s\n", prlen, prdata);
m += cid_datalen; m += cid_datalen;
cid_i += cid_datalen + 2; cid_i += cid_datalen + 2;