sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Add a new extract_bcd_number utility

This commit is contained in:
Denis Kenzior 2009-06-18 03:45:55 -05:00
parent 1c6d44d9c0
commit 314478c756
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/smsutil.c
View File

@ -31,17 +31,20 @@
#include "util.h"
#include "smsutil.h"
static inline gboolean is_bit_set(unsigned char oct, int bit)
void extract_bcd_number(const unsigned char *buf, int len, char *out)
{
int mask = 0x1 << bit;
return oct & mask ? TRUE : FALSE;
}
static const char digit_lut[] = "0123456789*#abc\0";
unsigned char oct;
int i;
static inline unsigned char bit_field(unsigned char oct, int start, int num)
{
unsigned char mask = (0x1 << num) - 1;
for (i = 0; i < len; i++) {
oct = buf[i];
return (oct >> start) & mask;
out[i*2] = digit_lut[oct & 0x0f];
out[i*2+1] = digit_lut[(oct & 0xf0) >> 4];
}
out[i*2] = '\0';
}
static inline int to_semi_oct(char in)
@ -532,7 +535,6 @@ static gboolean decode_address(const unsigned char *pdu, int len,
int *offset, gboolean sc,
struct sms_address *out)
{
static const char digit_lut[] = "0123456789*#abc\0";
unsigned char addr_len;
unsigned char addr_type;
int byte_len;
@ -561,17 +563,8 @@ static gboolean decode_address(const unsigned char *pdu, int len,
out->numbering_plan = bit_field(addr_type, 0, 4);
if (out->number_type != SMS_NUMBER_TYPE_ALPHANUMERIC) {
unsigned char oct;
for (i = 0; i < byte_len; i++) {
if (!next_octet(pdu, len, offset, &oct))
break;
out->address[i*2] = digit_lut[oct & 0x0f];
out->address[i*2+1] = digit_lut[(oct & 0xf0) >> 4];
}
out->address[i*2] = '\0';
extract_bcd_number(pdu+*offset, byte_len, out->address);
*offset += byte_len;
} else {
int chars;
long written;

15
src/smsutil.h
View File

@ -332,6 +332,21 @@ struct sms_assembly {
GSList *assembly_list;
};
static inline gboolean is_bit_set(unsigned char oct, int bit)
{
int mask = 0x1 << bit;
return oct & mask ? TRUE : FALSE;
}
static inline unsigned char bit_field(unsigned char oct, int start, int num)
{
unsigned char mask = (0x1 << num) - 1;
return (oct >> start) & mask;
}
void extract_bcd_number(const unsigned char *buf, int len, char *out);
gboolean sms_decode(const unsigned char *pdu, int len, gboolean outgoing,
int tpdu_len, struct sms *out);