ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

List attribute request entries also during build

This commit is contained in:
Andreas Steffen 2015-05-24 09:17:29 +02:00
parent 13497e6cc1
commit d6b75c9563
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -19,7 +19,7 @@
# initialize & set some vars # initialize & set some vars
# ============================ # ============================
AC_INIT([strongSwan],[5.3.1dr1]) AC_INIT([strongSwan],[5.3.1rc1])
AM_INIT_AUTOMAKE(m4_esyscmd([ AM_INIT_AUTOMAKE(m4_esyscmd([
echo tar-ustar echo tar-ustar
echo subdir-objects echo subdir-objects

27
src/libimcv/ietf/ietf_attr_attr_request.c
View File

@ -138,8 +138,21 @@ METHOD(pa_tnc_attr_t, build, void,
METHOD(ietf_attr_attr_request_t, add, void, METHOD(ietf_attr_attr_request_t, add, void,
private_ietf_attr_attr_request_t *this, pen_t vendor_id, u_int32_t type) private_ietf_attr_attr_request_t *this, pen_t vendor_id, u_int32_t type)
{ {
enum_name_t *pa_attr_names;
pen_type_t *entry; pen_type_t *entry;
pa_attr_names = imcv_pa_tnc_attributes->get_names(imcv_pa_tnc_attributes,
vendor_id);
if (pa_attr_names)
{
DBG2(DBG_TNC, " 0x%06x/0x%08x '%N/%N'", vendor_id, type,
pen_names, vendor_id, pa_attr_names, type);
}
else
{
DBG2(DBG_TNC, " 0x%06x/0x%08x '%N'", vendor_id, type,
pen_names, vendor_id);
}
entry = malloc_thing(pen_type_t); entry = malloc_thing(pen_type_t);
entry->vendor_id = vendor_id; entry->vendor_id = vendor_id;
entry->type = type; entry->type = type;
@ -150,7 +163,6 @@ METHOD(pa_tnc_attr_t, process, status_t,
private_ietf_attr_attr_request_t *this, u_int32_t *offset) private_ietf_attr_attr_request_t *this, u_int32_t *offset)
{ {
bio_reader_t *reader; bio_reader_t *reader;
enum_name_t *pa_attr_names;
pen_t vendor_id; pen_t vendor_id;
u_int32_t type; u_int32_t type;
u_int8_t reserved; u_int8_t reserved;
@ -176,19 +188,6 @@ METHOD(pa_tnc_attr_t, process, status_t,
reader->read_uint8 (reader, &reserved); reader->read_uint8 (reader, &reserved);
reader->read_uint24(reader, &vendor_id); reader->read_uint24(reader, &vendor_id);
reader->read_uint32(reader, &type); reader->read_uint32(reader, &type);
pa_attr_names = imcv_pa_tnc_attributes->get_names(imcv_pa_tnc_attributes,
vendor_id);
if (pa_attr_names)
{
DBG2(DBG_TNC, " 0x%06x/0x%08x '%N/%N'", vendor_id, type,
pen_names, vendor_id, pa_attr_names, type);
}
else
{
DBG2(DBG_TNC, " 0x%06x/0x%08x '%N'", vendor_id, type,
pen_names, vendor_id);
}
add(this, vendor_id, type); add(this, vendor_id, type);
} }
reader->destroy(reader); reader->destroy(reader);