stv0g/re
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bfcp: fix alignment issues

Browse source
This commit is contained in:
Richard Aas 2011-09-07 12:35:23 +00:00
parent 0afe8fbf2d
commit 3e294a96dc
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/re_bfcp.h
View file

@ -131,7 +131,7 @@ struct bfcp_floor_reqinfo {
size_t frsc;
struct bfcp_beneficiary_info bfi;
struct bfcp_reqby_info rbi;
uint8_t prio;
enum bfcp_prio prio;
char *ppi;
};
@ -148,7 +148,7 @@ struct bfcp_attr {
uint16_t bfid;
uint16_t floorid;
uint16_t freqid;
uint8_t prio;
enum bfcp_prio prio;
struct bfcp_reqstat reqstat;
struct bfcp_errcode errcode;
char *errinfo;

12
src/bfcp/attr.c
View file

@ -96,7 +96,8 @@ int bfcp_attr_encode(struct mbuf *mb, bool mand, enum bfcp_attrib type,
const struct bfcp_reqby_info *rbi = v;
const struct bfcp_floor_reqstat *frs = v;
const struct bfcp_overall_reqstat *ors = v;
const unsigned int *num = v;
const uint16_t *u16 = v;
const enum bfcp_prio *prio = v;
size_t start, len, i;
int err = 0;
@ -111,11 +112,11 @@ int bfcp_attr_encode(struct mbuf *mb, bool mand, enum bfcp_attrib type,
case BFCP_BENEFICIARY_ID:
case BFCP_FLOOR_ID:
case BFCP_FLOOR_REQUEST_ID:
err |= mbuf_write_u16(mb, htons(*num));
err |= mbuf_write_u16(mb, htons(*u16));
break;
case BFCP_PRIORITY:
err |= mbuf_write_u8(mb, *num << 5);
err |= mbuf_write_u8(mb, *prio << 5);
err |= mbuf_write_u8(mb, 0x00);
break;
@ -598,10 +599,13 @@ static int attr_print(int16_t level, struct re_printf *pf,
case BFCP_BENEFICIARY_ID:
case BFCP_FLOOR_ID:
case BFCP_FLOOR_REQUEST_ID:
case BFCP_PRIORITY:
err |= re_hprintf(pf, "%u", v->u16);
break;
case BFCP_PRIORITY:
err |= re_hprintf(pf, "%d", v->prio);
break;
case BFCP_REQUEST_STATUS:
err |= re_hprintf(pf, "%s (%d), qpos=%u",
bfcp_reqstat_name(v->reqstat.stat),