added a reference count for PA-TNC attributes

This commit is contained in:
Andreas Steffen 2011-06-03 16:39:27 +02:00
parent bc20bc1927
commit 2f7f248f11
3 changed files with 50 additions and 5 deletions

View File

@ -89,6 +89,11 @@ struct private_ietf_attr_pa_tnc_error_t {
* PA-TNC message header * PA-TNC message header
*/ */
chunk_t header; chunk_t header;
/**
* Reference count
*/
refcount_t ref;
}; };
METHOD(pa_tnc_attr_t, get_vendor_id, pen_t, METHOD(pa_tnc_attr_t, get_vendor_id, pen_t,
@ -141,11 +146,21 @@ METHOD(pa_tnc_attr_t, process, status_t,
return SUCCESS; return SUCCESS;
} }
METHOD(pa_tnc_attr_t, get_ref, pa_tnc_attr_t*,
private_ietf_attr_pa_tnc_error_t *this)
{
ref_get(&this->ref);
return &this->public.pa_tnc_attribute;
}
METHOD(pa_tnc_attr_t, destroy, void, METHOD(pa_tnc_attr_t, destroy, void,
private_ietf_attr_pa_tnc_error_t *this) private_ietf_attr_pa_tnc_error_t *this)
{ {
free(this->header.ptr); if (ref_put(&this->ref))
free(this); {
free(this->header.ptr);
free(this);
}
} }
METHOD(ietf_attr_pa_tnc_error_t, get_error_vendor_id, pen_t, METHOD(ietf_attr_pa_tnc_error_t, get_error_vendor_id, pen_t,
@ -181,6 +196,7 @@ pa_tnc_attr_t *ietf_attr_pa_tnc_error_create(pen_t vendor_id,
.set_noskip_flag = _set_noskip_flag, .set_noskip_flag = _set_noskip_flag,
.build = _build, .build = _build,
.process = _process, .process = _process,
.get_ref = _get_ref,
.destroy = _destroy, .destroy = _destroy,
}, },
.get_vendor_id = _get_error_vendor_id, .get_vendor_id = _get_error_vendor_id,
@ -191,6 +207,7 @@ pa_tnc_attr_t *ietf_attr_pa_tnc_error_create(pen_t vendor_id,
.error_vendor_id = vendor_id, .error_vendor_id = vendor_id,
.error_code = error_code, .error_code = error_code,
.header = chunk_clone(header), .header = chunk_clone(header),
.ref = 1,
); );
return &this->public.pa_tnc_attribute; return &this->public.pa_tnc_attribute;
@ -211,6 +228,7 @@ pa_tnc_attr_t *ietf_attr_pa_tnc_error_create_from_data(chunk_t data)
.get_value = _get_value, .get_value = _get_value,
.build = _build, .build = _build,
.process = _process, .process = _process,
.get_ref = _get_ref,
.destroy = _destroy, .destroy = _destroy,
}, },
.get_vendor_id = _get_error_vendor_id, .get_vendor_id = _get_error_vendor_id,
@ -219,6 +237,7 @@ pa_tnc_attr_t *ietf_attr_pa_tnc_error_create_from_data(chunk_t data)
.vendor_id = PEN_IETF, .vendor_id = PEN_IETF,
.type = IETF_ATTR_PA_TNC_ERROR, .type = IETF_ATTR_PA_TNC_ERROR,
.value = chunk_clone(data), .value = chunk_clone(data),
.ref = 1,
); );
return &this->public.pa_tnc_attribute; return &this->public.pa_tnc_attribute;

View File

@ -54,6 +54,11 @@ struct private_ita_attr_command_t {
* Command string * Command string
*/ */
char *command; char *command;
/**
* Reference count
*/
refcount_t ref;
}; };
METHOD(pa_tnc_attr_t, get_vendor_id, pen_t, METHOD(pa_tnc_attr_t, get_vendor_id, pen_t,
@ -103,12 +108,22 @@ METHOD(pa_tnc_attr_t, process, status_t,
return SUCCESS; return SUCCESS;
} }
METHOD(pa_tnc_attr_t, get_ref, pa_tnc_attr_t*,
private_ita_attr_command_t *this)
{
ref_get(&this->ref);
return &this->public.pa_tnc_attribute;
}
METHOD(pa_tnc_attr_t, destroy, void, METHOD(pa_tnc_attr_t, destroy, void,
private_ita_attr_command_t *this) private_ita_attr_command_t *this)
{ {
free(this->value.ptr); if (ref_put(&this->ref))
free(this->command); {
free(this); free(this->value.ptr);
free(this->command);
free(this);
}
} }
METHOD(ita_attr_command_t, get_command, char*, METHOD(ita_attr_command_t, get_command, char*,
@ -134,6 +149,7 @@ pa_tnc_attr_t *ita_attr_command_create(char *command)
.set_noskip_flag = _set_noskip_flag, .set_noskip_flag = _set_noskip_flag,
.build = _build, .build = _build,
.process = _process, .process = _process,
.get_ref = _get_ref,
.destroy = _destroy, .destroy = _destroy,
}, },
.get_command = _get_command, .get_command = _get_command,
@ -141,6 +157,7 @@ pa_tnc_attr_t *ita_attr_command_create(char *command)
.vendor_id = PEN_ITA, .vendor_id = PEN_ITA,
.type = ITA_ATTR_COMMAND, .type = ITA_ATTR_COMMAND,
.command = strdup(command), .command = strdup(command),
.ref = 1,
); );
return &this->public.pa_tnc_attribute; return &this->public.pa_tnc_attribute;
@ -161,6 +178,7 @@ pa_tnc_attr_t *ita_attr_command_create_from_data(chunk_t data)
.get_value = _get_value, .get_value = _get_value,
.build = _build, .build = _build,
.process = _process, .process = _process,
.get_ref = _get_ref,
.destroy = _destroy, .destroy = _destroy,
}, },
.get_command = _get_command, .get_command = _get_command,
@ -168,6 +186,7 @@ pa_tnc_attr_t *ita_attr_command_create_from_data(chunk_t data)
.vendor_id = PEN_ITA, .vendor_id = PEN_ITA,
.type = ITA_ATTR_COMMAND, .type = ITA_ATTR_COMMAND,
.value = chunk_clone(data), .value = chunk_clone(data),
.ref = 1,
); );
return &this->public.pa_tnc_attribute; return &this->public.pa_tnc_attribute;

View File

@ -79,6 +79,13 @@ struct pa_tnc_attr_t {
*/ */
status_t (*process)(pa_tnc_attr_t *this); status_t (*process)(pa_tnc_attr_t *this);
/**
* Get a new reference to the PA-TNC attribute
*
* @return this, with an increased refcount
*/
pa_tnc_attr_t* (*get_ref)(pa_tnc_attr_t *this);
/** /**
* Destroys a pa_tnc_attr_t object. * Destroys a pa_tnc_attr_t object.
*/ */