February 2011 - sr-dev - kamailio.org

git:master: kamdbctl: create uacreg table
by Daniel-Constantin Mierla 28 Feb '11

28 Feb '11

Module: sip-router Branch: master Commit: 1c82d0a422482298b0ae5da299fccd98d67fd6f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c82d0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 20:32:09 2011 +0100 kamdbctl: create uacreg table - uacreg table was not created by kamdbctl --- utils/kamctl/kamdbctl.base | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 85d8fa2..acc7d4a 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -36,8 +36,9 @@ STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber location re_grp trusted address missed_calls usr_preferences aliases silo dialog dispatcher dialplan} -EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy carrierroute - carrier_name domain_name carrierfailureroute userblacklist globalblacklist htable purplemap} +EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy + carrierroute carrier_name domain_name carrierfailureroute userblacklist + globalblacklist htable purplemap uacreg} PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap pua rls_presentity rls_watchers} @@ -65,7 +66,8 @@ STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions registrar usrloc msilo alias_db uri_db speeddial avpops auth_db pdt dialog dispatcher dialplan} -EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute userblacklist htable purple} +EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute + userblacklist htable purple uac} ############################################################

1 0

git:3.1: core: update the list of header that alloc pkg for parsed structure
by Daniel-Constantin Mierla 28 Feb '11

28 Feb '11

Module: sip-router Branch: 3.1 Commit: e617e8c67b45e55fdc22a462a5742a835a6bc81a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e617e8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 14:27:25 2011 +0100 core: update the list of header that alloc pkg for parsed structure (cherry picked from commit 33ec2a39200c0cfaf90524970fa5249c17a2b602) --- parser/hf.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/parser/hf.h b/parser/hf.h index 035c91c..759dc6d 100644 --- a/parser/hf.h +++ b/parser/hf.h @@ -228,19 +228,29 @@ static inline int hdr_allocs_parse(struct hdr_field* hdr) case HDR_VIA_T: case HDR_TO_T: case HDR_FROM_T: + case HDR_CSEQ_T: case HDR_CONTACT_T: case HDR_ROUTE_T: case HDR_RECORDROUTE_T: case HDR_AUTHORIZATION_T: case HDR_EXPIRES_T: case HDR_PROXYAUTH_T: + case HDR_ALLOW_T: case HDR_EVENT_T: case HDR_ACCEPT_T: case HDR_CONTENTDISPOSITION_T: case HDR_DIVERSION_T: + case HDR_DATE_T: case HDR_RPID_T: case HDR_REFER_TO_T: + case HDR_SIPIFMATCH_T: case HDR_SUBSCRIPTION_STATE_T: + case HDR_IDENTITY_INFO_T: + case HDR_IDENTITY_T: + case HDR_SUPPORTED_T: + case HDR_SESSIONEXPIRES_T: + case HDR_PPI_T: + case HDR_PAI_T: return 1; default: return 0;

1 0

git:3.1: core: helper function to free parsed header struct with inner free function
by Daniel-Constantin Mierla 28 Feb '11

28 Feb '11

Module: sip-router Branch: 3.1 Commit: a088c048179762f051efb36d45ba68eec17d05aa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a088c04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 17:17:09 2011 +0100 core: helper function to free parsed header struct with inner free function (cherry picked from commit ad8c9360348d111085a8e01a277e6b718ef803ad) --- parser/hf.c | 26 +++++++++++++++++++------- parser/hf.h | 8 ++++++++ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/parser/hf.c b/parser/hf.c index d094785..4d6de0b 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -152,10 +152,7 @@ void clean_hdr_field(struct hdr_field* hf) break; case HDR_SESSIONEXPIRES_T: - if(*h_parsed) { - ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); - *h_parsed = 0; - } + hdr_free_parsed(h_parsed); break; case HDR_SIPIFMATCH_T: @@ -167,9 +164,7 @@ void clean_hdr_field(struct hdr_field* hf) break; case HDR_SUPPORTED_T: - if(*h_parsed) { - ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); - } + hdr_free_parsed(h_parsed); break; case HDR_TO_T: @@ -233,6 +228,7 @@ void free_hdr_field_lst(struct hdr_field* hf) } } +/* print the content of hdr_field */ void dump_hdr_field( struct hdr_field* hf ) { LOG(L_ERR, "DEBUG: dump_hdr_field: type=%d, name=%.*s, " @@ -241,3 +237,19 @@ void dump_hdr_field( struct hdr_field* hf ) hf->body.len, ZSW(hf->body.s), hf->parsed, hf->next ); } + +/** + * free hdr parsed structure using inner free function + * - hdr parsed struct must have as first file a free function, + * so it can be caseted to hf_parsed_t + */ +void hdr_free_parsed(void **h_parsed) +{ + if(h_parsed==NULL || *h_parsed==NULL) + return; + + if(((hf_parsed_t*)(*h_parsed))->hfree) { + ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); + } + *h_parsed = 0; +} diff --git a/parser/hf.h b/parser/hf.h index e880987..a373836 100644 --- a/parser/hf.h +++ b/parser/hf.h @@ -268,6 +268,14 @@ void clean_hdr_field(struct hdr_field* hf); */ void free_hdr_field_lst(struct hdr_field* hf); +/* print content of hdr_field */ void dump_hdr_field( struct hdr_field* hf ); +/** + * free hdr parsed structure using inner free function + * - hdr parsed struct must have as first file a free function, + * so it can be caseted to hf_parsed_t + */ +void hdr_free_parsed(void **h_parsed); + #endif /* HF_H */

1 0

git:3.1: core: order the list of headers that allocate pkg
by Daniel-Constantin Mierla 28 Feb '11

28 Feb '11

Module: sip-router Branch: 3.1 Commit: b64268bf768e979b4d7b34b5240b006dcba573ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b64268b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 16:18:24 2011 +0100 core: order the list of headers that allocate pkg - easier to spot the missing ones (cherry picked from commit 2316acaa9adc27355e777d281bee8bfaf393cd6d) --- parser/hf.c | 164 ++++++++++++++++++++++++---------------------------------- parser/hf.h | 38 +++++++------- 2 files changed, 87 insertions(+), 115 deletions(-) diff --git a/parser/hf.c b/parser/hf.c index 207a7ab..d094785 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -68,154 +68,134 @@ void clean_hdr_field(struct hdr_field* hf) void** h_parsed; if (hf->parsed){ - h_parsed=&hf->parsed; /*strict aliasing warnings workarround */ + h_parsed=&hf->parsed; /* strict aliasing warnings workarround */ switch(hf->type){ - case HDR_VIA_T: - free_via_list(hf->parsed); - break; - - case HDR_TO_T: - free_to(hf->parsed); - break; - - case HDR_FROM_T: - free_to(hf->parsed); - break; - - case HDR_CSEQ_T: - free_cseq(hf->parsed); + /* headers with pkg alloc for parsed structure (alphabetic order) */ + case HDR_ACCEPT_T: + pkg_free(hf->parsed); break; - case HDR_CALLID_T: + case HDR_ALLOW_T: + free_allow_header(hf); break; - case HDR_SIPIFMATCH_T: - free_sipifmatch((str **)h_parsed); + case HDR_AUTHORIZATION_T: + free_credentials((auth_body_t**)h_parsed); break; case HDR_CONTACT_T: free_contact((contact_body_t**)h_parsed); break; - case HDR_MAXFORWARDS_T: - break; - - case HDR_ROUTE_T: - free_rr((rr_t**)h_parsed); - break; - - case HDR_RECORDROUTE_T: - free_rr((rr_t**)h_parsed); + case HDR_CONTENTDISPOSITION_T: + free_disposition( ((struct disposition**)h_parsed)); break; - case HDR_CONTENTTYPE_T: + case HDR_CSEQ_T: + free_cseq(hf->parsed); break; - case HDR_CONTENTLENGTH_T: + case HDR_DATE_T: + free_date(hf->parsed); break; - case HDR_RETRY_AFTER_T: + case HDR_DIVERSION_T: + free_to(hf->parsed); break; - case HDR_AUTHORIZATION_T: - free_credentials((auth_body_t**)h_parsed); + case HDR_EVENT_T: + free_event((event_t**)h_parsed); break; case HDR_EXPIRES_T: free_expires((exp_body_t**)h_parsed); break; - case HDR_PROXYAUTH_T: - free_credentials((auth_body_t**)h_parsed); - break; - - case HDR_SUPPORTED_T: - if(*h_parsed) { - ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); - } - break; - - case HDR_REQUIRE_T: - break; - - case HDR_PROXYREQUIRE_T: - break; - - case HDR_UNSUPPORTED_T: - break; - - case HDR_ALLOW_T: - free_allow_header(hf); - break; - - case HDR_EVENT_T: - free_event((event_t**)h_parsed); - break; - - case HDR_ACCEPT_T: - pkg_free(hf->parsed); + case HDR_FROM_T: + free_to(hf->parsed); break; - case HDR_ACCEPTLANGUAGE_T: + case HDR_IDENTITY_INFO_T: + free_identityinfo(hf->parsed); break; - case HDR_ORGANIZATION_T: + case HDR_IDENTITY_T: + free_identity(hf->parsed); break; - case HDR_PRIORITY_T: + case HDR_PAI_T: + free_to(hf->parsed); break; - case HDR_SUBJECT_T: + case HDR_PPI_T: + free_to(hf->parsed); break; - case HDR_USERAGENT_T: + case HDR_PROXYAUTH_T: + free_credentials((auth_body_t**)h_parsed); break; - case HDR_SERVER_T: + case HDR_RECORDROUTE_T: + free_rr((rr_t**)h_parsed); break; - case HDR_ACCEPTDISPOSITION_T: + case HDR_REFER_TO_T: + free_to(hf->parsed); break; - case HDR_CONTENTDISPOSITION_T: - free_disposition( ((struct disposition**)h_parsed)); + case HDR_ROUTE_T: + free_rr((rr_t**)h_parsed); break; - case HDR_DIVERSION_T: + case HDR_RPID_T: free_to(hf->parsed); break; - case HDR_RPID_T: - free_to(hf->parsed); + case HDR_SESSIONEXPIRES_T: + if(*h_parsed) { + ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); + *h_parsed = 0; + } break; - case HDR_REFER_TO_T: - free_to(hf->parsed); + case HDR_SIPIFMATCH_T: + free_sipifmatch((str **)h_parsed); break; case HDR_SUBSCRIPTION_STATE_T: free_subscription_state((subscription_state_t**)h_parsed); break; - case HDR_DATE_T: - free_date(hf->parsed); - break; - - case HDR_IDENTITY_INFO_T: - free_identityinfo(hf->parsed); + case HDR_SUPPORTED_T: + if(*h_parsed) { + ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); + } break; - case HDR_IDENTITY_T: - free_identity(hf->parsed); + case HDR_TO_T: + free_to(hf->parsed); break; - case HDR_SESSIONEXPIRES_T: - if(*h_parsed) { - ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); - *h_parsed = 0; - } + case HDR_VIA_T: + free_via_list(hf->parsed); break; + /* headers with no alloc for parsed structure */ + case HDR_CALLID_T: + case HDR_MAXFORWARDS_T: + case HDR_CONTENTTYPE_T: + case HDR_CONTENTLENGTH_T: + case HDR_RETRY_AFTER_T: + case HDR_REQUIRE_T: + case HDR_PROXYREQUIRE_T: + case HDR_UNSUPPORTED_T: + case HDR_ACCEPTLANGUAGE_T: + case HDR_ORGANIZATION_T: + case HDR_PRIORITY_T: + case HDR_SUBJECT_T: + case HDR_USERAGENT_T: + case HDR_SERVER_T: + case HDR_ACCEPTDISPOSITION_T: case HDR_MIN_SE_T: case HDR_ACCEPTCONTACT_T: case HDR_ALLOWEVENTS_T: @@ -230,14 +210,6 @@ void clean_hdr_field(struct hdr_field* hf) case HDR_REASON_T: break; - case HDR_PPI_T: - free_to(hf->parsed); - break; - - case HDR_PAI_T: - free_to(hf->parsed); - break; - default: LOG(L_CRIT, "BUG: clean_hdr_field: unknown header type %d\n", hf->type); diff --git a/parser/hf.h b/parser/hf.h index 759dc6d..e880987 100644 --- a/parser/hf.h +++ b/parser/hf.h @@ -225,32 +225,32 @@ typedef struct hdr_parsed { static inline int hdr_allocs_parse(struct hdr_field* hdr) { switch(hdr->type){ - case HDR_VIA_T: - case HDR_TO_T: - case HDR_FROM_T: - case HDR_CSEQ_T: - case HDR_CONTACT_T: - case HDR_ROUTE_T: - case HDR_RECORDROUTE_T: - case HDR_AUTHORIZATION_T: - case HDR_EXPIRES_T: - case HDR_PROXYAUTH_T: - case HDR_ALLOW_T: - case HDR_EVENT_T: case HDR_ACCEPT_T: + case HDR_ALLOW_T: + case HDR_AUTHORIZATION_T: + case HDR_CONTACT_T: case HDR_CONTENTDISPOSITION_T: - case HDR_DIVERSION_T: + case HDR_CSEQ_T: case HDR_DATE_T: - case HDR_RPID_T: + case HDR_DIVERSION_T: + case HDR_EVENT_T: + case HDR_EXPIRES_T: + case HDR_FROM_T: + case HDR_IDENTITY_INFO_T: + case HDR_IDENTITY_T: + case HDR_PAI_T: + case HDR_PPI_T: + case HDR_PROXYAUTH_T: + case HDR_RECORDROUTE_T: case HDR_REFER_TO_T: + case HDR_ROUTE_T: + case HDR_RPID_T: + case HDR_SESSIONEXPIRES_T: case HDR_SIPIFMATCH_T: case HDR_SUBSCRIPTION_STATE_T: - case HDR_IDENTITY_INFO_T: - case HDR_IDENTITY_T: case HDR_SUPPORTED_T: - case HDR_SESSIONEXPIRES_T: - case HDR_PPI_T: - case HDR_PAI_T: + case HDR_TO_T: + case HDR_VIA_T: return 1; default: return 0;

1 0

git:3.1: core: free SE header parsed structure
by Daniel-Constantin Mierla 28 Feb '11

28 Feb '11

Module: sip-router Branch: 3.1 Commit: 217834b49ef8734d23bc914b1caa6c5357aeff42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=217834b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 11:17:10 2011 +0100 core: free SE header parsed structure - use the generic free framework for headers (cherry picked from commit 469650e0a904331b07f8713baab6d7f19027ee48) --- parser/hf.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/parser/hf.c b/parser/hf.c index 8863a10..207a7ab 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -210,6 +210,12 @@ void clean_hdr_field(struct hdr_field* hf) break; case HDR_SESSIONEXPIRES_T: + if(*h_parsed) { + ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); + *h_parsed = 0; + } + break; + case HDR_MIN_SE_T: case HDR_ACCEPTCONTACT_T: case HDR_ALLOWEVENTS_T:

1 0

git:3.1: kcore: free SE parsed body through generic hdr free framework
by Daniel-Constantin Mierla 28 Feb '11

28 Feb '11

Module: sip-router Branch: 3.1 Commit: 7a3cf7dcf2b1bf7a8fa2f3c5a50af96fbb7712ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a3cf7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 11:15:53 2011 +0100 kcore: free SE parsed body through generic hdr free framework - the parser for session-expires header uses now the generic header free framework (cherry picked from commit 1f092363559ebdcdbaf02cb5d8f093b6bea60b87) --- lib/kcore/parse_sst.c | 13 ++++++++++++- lib/kcore/parse_sst.h | 1 + 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/lib/kcore/parse_sst.c b/lib/kcore/parse_sst.c index 1f4f5ea..9a5e9c1 100644 --- a/lib/kcore/parse_sst.c +++ b/lib/kcore/parse_sst.c @@ -68,6 +68,16 @@ malloc_session_expires( void ) return se; } +/** + * wrapper to free the content of parsed session-expires header + */ +void hf_free_session_expires(void *parsed) +{ + struct session_expires *se; + se = (struct session_expires*)parsed; + free_session_expires(se); +} + void free_session_expires( struct session_expires *se ) @@ -84,7 +94,7 @@ parse_session_expires_body( struct hdr_field *hf ) int pos = 0; int len = hf->body.len; char *q; - struct session_expires se = { 0, sst_refresher_unspecified }; + struct session_expires se = { 0, 0, sst_refresher_unspecified }; unsigned tok; if ( !p || len <= 0 ) { @@ -165,6 +175,7 @@ parse_session_expires_body( struct hdr_field *hf ) LM_ERR(" out of pkg memory\n" ); return parse_sst_out_of_mem; } + se.hfree = hf_free_session_expires; *((struct session_expires *)hf->parsed) = se; return parse_sst_success; diff --git a/lib/kcore/parse_sst.h b/lib/kcore/parse_sst.h index e4c2c62..79174a3 100644 --- a/lib/kcore/parse_sst.h +++ b/lib/kcore/parse_sst.h @@ -53,6 +53,7 @@ enum sst_refresher { * a pointer to a struct session_expires. */ struct session_expires { + hf_parsed_free_f hfree; /* function to free the content */ unsigned interval; /* in seconds */ enum sst_refresher refresher; };

1 0

git:master: core: order the list of headers that allocate pkg
by Daniel-Constantin Mierla 28 Feb '11

28 Feb '11

Module: sip-router Branch: master Commit: 2316acaa9adc27355e777d281bee8bfaf393cd6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2316aca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 16:18:24 2011 +0100 core: order the list of headers that allocate pkg - easier to spot the missing ones --- parser/hf.c | 164 ++++++++++++++++++++++++---------------------------------- parser/hf.h | 38 +++++++------- 2 files changed, 87 insertions(+), 115 deletions(-) diff --git a/parser/hf.c b/parser/hf.c index 207a7ab..d094785 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -68,154 +68,134 @@ void clean_hdr_field(struct hdr_field* hf) void** h_parsed; if (hf->parsed){ - h_parsed=&hf->parsed; /*strict aliasing warnings workarround */ + h_parsed=&hf->parsed; /* strict aliasing warnings workarround */ switch(hf->type){ - case HDR_VIA_T: - free_via_list(hf->parsed); - break; - - case HDR_TO_T: - free_to(hf->parsed); - break; - - case HDR_FROM_T: - free_to(hf->parsed); - break; - - case HDR_CSEQ_T: - free_cseq(hf->parsed); + /* headers with pkg alloc for parsed structure (alphabetic order) */ + case HDR_ACCEPT_T: + pkg_free(hf->parsed); break; - case HDR_CALLID_T: + case HDR_ALLOW_T: + free_allow_header(hf); break; - case HDR_SIPIFMATCH_T: - free_sipifmatch((str **)h_parsed); + case HDR_AUTHORIZATION_T: + free_credentials((auth_body_t**)h_parsed); break; case HDR_CONTACT_T: free_contact((contact_body_t**)h_parsed); break; - case HDR_MAXFORWARDS_T: - break; - - case HDR_ROUTE_T: - free_rr((rr_t**)h_parsed); - break; - - case HDR_RECORDROUTE_T: - free_rr((rr_t**)h_parsed); + case HDR_CONTENTDISPOSITION_T: + free_disposition( ((struct disposition**)h_parsed)); break; - case HDR_CONTENTTYPE_T: + case HDR_CSEQ_T: + free_cseq(hf->parsed); break; - case HDR_CONTENTLENGTH_T: + case HDR_DATE_T: + free_date(hf->parsed); break; - case HDR_RETRY_AFTER_T: + case HDR_DIVERSION_T: + free_to(hf->parsed); break; - case HDR_AUTHORIZATION_T: - free_credentials((auth_body_t**)h_parsed); + case HDR_EVENT_T: + free_event((event_t**)h_parsed); break; case HDR_EXPIRES_T: free_expires((exp_body_t**)h_parsed); break; - case HDR_PROXYAUTH_T: - free_credentials((auth_body_t**)h_parsed); - break; - - case HDR_SUPPORTED_T: - if(*h_parsed) { - ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); - } - break; - - case HDR_REQUIRE_T: - break; - - case HDR_PROXYREQUIRE_T: - break; - - case HDR_UNSUPPORTED_T: - break; - - case HDR_ALLOW_T: - free_allow_header(hf); - break; - - case HDR_EVENT_T: - free_event((event_t**)h_parsed); - break; - - case HDR_ACCEPT_T: - pkg_free(hf->parsed); + case HDR_FROM_T: + free_to(hf->parsed); break; - case HDR_ACCEPTLANGUAGE_T: + case HDR_IDENTITY_INFO_T: + free_identityinfo(hf->parsed); break; - case HDR_ORGANIZATION_T: + case HDR_IDENTITY_T: + free_identity(hf->parsed); break; - case HDR_PRIORITY_T: + case HDR_PAI_T: + free_to(hf->parsed); break; - case HDR_SUBJECT_T: + case HDR_PPI_T: + free_to(hf->parsed); break; - case HDR_USERAGENT_T: + case HDR_PROXYAUTH_T: + free_credentials((auth_body_t**)h_parsed); break; - case HDR_SERVER_T: + case HDR_RECORDROUTE_T: + free_rr((rr_t**)h_parsed); break; - case HDR_ACCEPTDISPOSITION_T: + case HDR_REFER_TO_T: + free_to(hf->parsed); break; - case HDR_CONTENTDISPOSITION_T: - free_disposition( ((struct disposition**)h_parsed)); + case HDR_ROUTE_T: + free_rr((rr_t**)h_parsed); break; - case HDR_DIVERSION_T: + case HDR_RPID_T: free_to(hf->parsed); break; - case HDR_RPID_T: - free_to(hf->parsed); + case HDR_SESSIONEXPIRES_T: + if(*h_parsed) { + ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); + *h_parsed = 0; + } break; - case HDR_REFER_TO_T: - free_to(hf->parsed); + case HDR_SIPIFMATCH_T: + free_sipifmatch((str **)h_parsed); break; case HDR_SUBSCRIPTION_STATE_T: free_subscription_state((subscription_state_t**)h_parsed); break; - case HDR_DATE_T: - free_date(hf->parsed); - break; - - case HDR_IDENTITY_INFO_T: - free_identityinfo(hf->parsed); + case HDR_SUPPORTED_T: + if(*h_parsed) { + ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); + } break; - case HDR_IDENTITY_T: - free_identity(hf->parsed); + case HDR_TO_T: + free_to(hf->parsed); break; - case HDR_SESSIONEXPIRES_T: - if(*h_parsed) { - ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); - *h_parsed = 0; - } + case HDR_VIA_T: + free_via_list(hf->parsed); break; + /* headers with no alloc for parsed structure */ + case HDR_CALLID_T: + case HDR_MAXFORWARDS_T: + case HDR_CONTENTTYPE_T: + case HDR_CONTENTLENGTH_T: + case HDR_RETRY_AFTER_T: + case HDR_REQUIRE_T: + case HDR_PROXYREQUIRE_T: + case HDR_UNSUPPORTED_T: + case HDR_ACCEPTLANGUAGE_T: + case HDR_ORGANIZATION_T: + case HDR_PRIORITY_T: + case HDR_SUBJECT_T: + case HDR_USERAGENT_T: + case HDR_SERVER_T: + case HDR_ACCEPTDISPOSITION_T: case HDR_MIN_SE_T: case HDR_ACCEPTCONTACT_T: case HDR_ALLOWEVENTS_T: @@ -230,14 +210,6 @@ void clean_hdr_field(struct hdr_field* hf) case HDR_REASON_T: break; - case HDR_PPI_T: - free_to(hf->parsed); - break; - - case HDR_PAI_T: - free_to(hf->parsed); - break; - default: LOG(L_CRIT, "BUG: clean_hdr_field: unknown header type %d\n", hf->type); diff --git a/parser/hf.h b/parser/hf.h index 759dc6d..e880987 100644 --- a/parser/hf.h +++ b/parser/hf.h @@ -225,32 +225,32 @@ typedef struct hdr_parsed { static inline int hdr_allocs_parse(struct hdr_field* hdr) { switch(hdr->type){ - case HDR_VIA_T: - case HDR_TO_T: - case HDR_FROM_T: - case HDR_CSEQ_T: - case HDR_CONTACT_T: - case HDR_ROUTE_T: - case HDR_RECORDROUTE_T: - case HDR_AUTHORIZATION_T: - case HDR_EXPIRES_T: - case HDR_PROXYAUTH_T: - case HDR_ALLOW_T: - case HDR_EVENT_T: case HDR_ACCEPT_T: + case HDR_ALLOW_T: + case HDR_AUTHORIZATION_T: + case HDR_CONTACT_T: case HDR_CONTENTDISPOSITION_T: - case HDR_DIVERSION_T: + case HDR_CSEQ_T: case HDR_DATE_T: - case HDR_RPID_T: + case HDR_DIVERSION_T: + case HDR_EVENT_T: + case HDR_EXPIRES_T: + case HDR_FROM_T: + case HDR_IDENTITY_INFO_T: + case HDR_IDENTITY_T: + case HDR_PAI_T: + case HDR_PPI_T: + case HDR_PROXYAUTH_T: + case HDR_RECORDROUTE_T: case HDR_REFER_TO_T: + case HDR_ROUTE_T: + case HDR_RPID_T: + case HDR_SESSIONEXPIRES_T: case HDR_SIPIFMATCH_T: case HDR_SUBSCRIPTION_STATE_T: - case HDR_IDENTITY_INFO_T: - case HDR_IDENTITY_T: case HDR_SUPPORTED_T: - case HDR_SESSIONEXPIRES_T: - case HDR_PPI_T: - case HDR_PAI_T: + case HDR_TO_T: + case HDR_VIA_T: return 1; default: return 0;

1 0

git:master: core: helper function to free parsed header struct with inner free function
by Daniel-Constantin Mierla 28 Feb '11

28 Feb '11

Module: sip-router Branch: master Commit: ad8c9360348d111085a8e01a277e6b718ef803ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad8c936… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 17:17:09 2011 +0100 core: helper function to free parsed header struct with inner free function --- parser/hf.c | 26 +++++++++++++++++++------- parser/hf.h | 8 ++++++++ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/parser/hf.c b/parser/hf.c index d094785..4d6de0b 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -152,10 +152,7 @@ void clean_hdr_field(struct hdr_field* hf) break; case HDR_SESSIONEXPIRES_T: - if(*h_parsed) { - ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); - *h_parsed = 0; - } + hdr_free_parsed(h_parsed); break; case HDR_SIPIFMATCH_T: @@ -167,9 +164,7 @@ void clean_hdr_field(struct hdr_field* hf) break; case HDR_SUPPORTED_T: - if(*h_parsed) { - ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); - } + hdr_free_parsed(h_parsed); break; case HDR_TO_T: @@ -233,6 +228,7 @@ void free_hdr_field_lst(struct hdr_field* hf) } } +/* print the content of hdr_field */ void dump_hdr_field( struct hdr_field* hf ) { LOG(L_ERR, "DEBUG: dump_hdr_field: type=%d, name=%.*s, " @@ -241,3 +237,19 @@ void dump_hdr_field( struct hdr_field* hf ) hf->body.len, ZSW(hf->body.s), hf->parsed, hf->next ); } + +/** + * free hdr parsed structure using inner free function + * - hdr parsed struct must have as first file a free function, + * so it can be caseted to hf_parsed_t + */ +void hdr_free_parsed(void **h_parsed) +{ + if(h_parsed==NULL || *h_parsed==NULL) + return; + + if(((hf_parsed_t*)(*h_parsed))->hfree) { + ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); + } + *h_parsed = 0; +} diff --git a/parser/hf.h b/parser/hf.h index e880987..a373836 100644 --- a/parser/hf.h +++ b/parser/hf.h @@ -268,6 +268,14 @@ void clean_hdr_field(struct hdr_field* hf); */ void free_hdr_field_lst(struct hdr_field* hf); +/* print content of hdr_field */ void dump_hdr_field( struct hdr_field* hf ); +/** + * free hdr parsed structure using inner free function + * - hdr parsed struct must have as first file a free function, + * so it can be caseted to hf_parsed_t + */ +void hdr_free_parsed(void **h_parsed); + #endif /* HF_H */

1 0

git:master: core: update the list of header that alloc pkg for parsed structure
by Daniel-Constantin Mierla 28 Feb '11

28 Feb '11

Module: sip-router Branch: master Commit: 33ec2a39200c0cfaf90524970fa5249c17a2b602 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33ec2a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 14:27:25 2011 +0100 core: update the list of header that alloc pkg for parsed structure --- parser/hf.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/parser/hf.h b/parser/hf.h index 035c91c..759dc6d 100644 --- a/parser/hf.h +++ b/parser/hf.h @@ -228,19 +228,29 @@ static inline int hdr_allocs_parse(struct hdr_field* hdr) case HDR_VIA_T: case HDR_TO_T: case HDR_FROM_T: + case HDR_CSEQ_T: case HDR_CONTACT_T: case HDR_ROUTE_T: case HDR_RECORDROUTE_T: case HDR_AUTHORIZATION_T: case HDR_EXPIRES_T: case HDR_PROXYAUTH_T: + case HDR_ALLOW_T: case HDR_EVENT_T: case HDR_ACCEPT_T: case HDR_CONTENTDISPOSITION_T: case HDR_DIVERSION_T: + case HDR_DATE_T: case HDR_RPID_T: case HDR_REFER_TO_T: + case HDR_SIPIFMATCH_T: case HDR_SUBSCRIPTION_STATE_T: + case HDR_IDENTITY_INFO_T: + case HDR_IDENTITY_T: + case HDR_SUPPORTED_T: + case HDR_SESSIONEXPIRES_T: + case HDR_PPI_T: + case HDR_PAI_T: return 1; default: return 0;

1 0

git:master: core: free SE header parsed structure
by Daniel-Constantin Mierla 28 Feb '11

28 Feb '11

Module: sip-router Branch: master Commit: 469650e0a904331b07f8713baab6d7f19027ee48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=469650e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 11:17:10 2011 +0100 core: free SE header parsed structure - use the generic free framework for headers --- parser/hf.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/parser/hf.c b/parser/hf.c index 8863a10..207a7ab 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -210,6 +210,12 @@ void clean_hdr_field(struct hdr_field* hf) break; case HDR_SESSIONEXPIRES_T: + if(*h_parsed) { + ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); + *h_parsed = 0; + } + break; + case HDR_MIN_SE_T: case HDR_ACCEPTCONTACT_T: case HDR_ALLOWEVENTS_T:

1 0