sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:master: db_postgres: handle prepare statements in DB APIv2

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 09c7b67beee9529d6a7c06e600c7f294bf453eda URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09c7b67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 4 16:14:42 2013 +0100 db_postgres: handle prepare statements in DB APIv2 - patch by Markus Bucher, closes FS#272 --- modules/db_postgres/pg_cmd.c | 71 +++++++++++++++++++++++++++++++++++++++++- modules/db_postgres/pg_fld.c | 1 + modules/db_postgres/pg_fld.h | 1 + 3 files changed, 72 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/pg_cmd.c b/modules/db_postgres/pg_cmd.c index eec1c1b..db7ad66 100644 --- a/modules/db_postgres/pg_cmd.c +++ b/modules/db_postgres/pg_cmd.c @@ -198,19 +198,88 @@ static int get_types(db_cmd_t* cmd) { struct pg_cmd* pcmd; struct pg_con* pcon; + int i, n; + pg_type_t *types; pcmd = DB_GET_PAYLOAD(cmd); /* FIXME */ pcon = DB_GET_PAYLOAD(cmd->ctx->con[db_payload_idx]); + types = pcon->oid; pcmd->types = PQdescribePrepared(pcon->con, pcmd->name); if (PQresultStatus(pcmd->types) != PGRES_COMMAND_OK) { ERR("postgres: Error while obtaining description of prepared statement\n"); return -1; } + /* adapted from check_result() in db_mysql */ + n = PQnfields(pcmd->types); + if (cmd->result == NULL) { + /* The result set parameter of db_cmd function was empty, that + * means the command is select * and we have to create the array + * of result fields in the cmd structure manually. + */ + cmd->result = db_fld(n + 1); + cmd->result_count = n; + for(i = 0; i < cmd->result_count; i++) { + struct pg_fld *f; + if (pg_fld(cmd->result + i, cmd->table.s) < 0) goto error; + f = DB_GET_PAYLOAD(cmd->result + i); + f->name = pkg_malloc(strlen(PQfname(pcmd->types, i))+1); + if (f->name == NULL) { + ERR("postgres: Out of private memory\n"); + goto error; + } + strcpy(f->name, PQfname(pcmd->types, i)); + cmd->result[i].name = f->name; + } + } else { + if (cmd->result_count != n) { + BUG("postgres: Number of fields in PQresult does not match number of parameters in DB API\n"); + goto error; + } + } + + /* Now iterate through all the columns in the result set and replace + * any occurrence of DB_UNKNOWN type with the type of the column + * retrieved from the database and if no column name was provided then + * update it from the database as well. + */ + for(i = 0; i < cmd->result_count; i++) { + Oid type = PQftype(pcmd->types, i); + if (cmd->result[i].type != DB_NONE) continue; + + if ((type == types[PG_INT2].oid) || (type == types[PG_INT4].oid) || (type == types[PG_INT8].oid)) + cmd->result[i].type = DB_INT; + else if (type == types[PG_FLOAT4].oid) + cmd->result[i].type = DB_FLOAT; + + else if (type == types[PG_FLOAT8].oid) + cmd->result[i].type = DB_DOUBLE; + + else if ((type == types[PG_TIMESTAMP].oid) || (type == types[PG_TIMESTAMPTZ].oid)) + cmd->result[i].type = DB_DATETIME; + + else if ((type == types[PG_VARCHAR].oid) || (type == types[PG_CHAR].oid) || (type == types[PG_TEXT].oid)) + cmd->result[i].type = DB_STR; + + else if ((type == types[PG_BIT].oid) || (type == types[PG_VARBIT].oid)) + cmd->result[i].type = DB_BITMAP; + + else if (type == types[PG_BYTE].oid) + cmd->result[i].type = DB_BLOB; + + else + { + ERR("postgres: Unsupported PostgreSQL column type: %d, table: %s, column: %s\n", + type, cmd->table.s, PQfname(pcmd->types, i)); + goto error; + } + } return 0; +error: + return -1; } @@ -352,7 +421,7 @@ static int upload_cmd(db_cmd_t* cmd) DBG("postgres: Uploading command '%s': '%s'\n", pcmd->name, pcmd->sql_cmd.s); - res = PQprepare(pcon->con, pcmd->name, pcmd->sql_cmd.s, 0, NULL); + res = PQprepare(pcon->con, pcmd->name, pcmd->sql_cmd.s, (cmd->match_count + cmd->vals_count), NULL); st = PQresultStatus(res); diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index 76ad4df..46d54f0 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -62,6 +62,7 @@ static void pg_fld_free(db_fld_t* fld, struct pg_fld* payload) { db_drv_free(&payload->gen); + if (payload->name) pkg_free(payload->name); pkg_free(payload); } diff --git a/modules/db_postgres/pg_fld.h b/modules/db_postgres/pg_fld.h index 09b9926..6cd9021 100644 --- a/modules/db_postgres/pg_fld.h +++ b/modules/db_postgres/pg_fld.h @@ -47,6 +47,7 @@ struct pg_fld { db_drv_t gen; + char* name; /** * A union of varius data types from db_fld, postgres expects binary * data in network byte order so we use these variables as temporary

11 years, 9 months

git:master: Makefile: split module groups definitions in Makefile.groups

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 23a22e2c8d73843798d66ec1bebe22cf7702213b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23a22e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 3 23:53:14 2013 +0100 Makefile: split module groups definitions in Makefile.groups - the part was quite big and it is more config related than build rules - it has to be updated with the current list of modules --- Makefile | 243 +------------------------------------------------------ Makefile.groups | 245 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 247 insertions(+), 241 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=23a…

11 years, 9 months

releasing v4.0.0

by Daniel-Constantin Mierla

Hello, from my point of view, the last to sort out for v4.0.0 is packaging (I just sent a dedicated email to decide on that). Personally I have been testing v4.0.0 thoroughly in various cases, no critical issue being on my list at this moment. Also, v4.0 is running for quite some time on voipuser.org (our usual life testing platform). I propose releasing v4.0.0 next Monday, on March 11, 2013. The second option, if more people prefer it, would be Thursday, March 14, 2013. Opinions? If anybody has other dates in mine, let us know here. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, April 16-17, 2013, Berlin - http://conference.kamailio.com -

11 years, 9 months

[tracker] Comment added: FIFO deadlock after dispatcher reload

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#275 - FIFO deadlock after dispatcher reload User who did this - Dmitry (dmdm21) ---------- It looks like instead of lock_destroy() we should be using lock_release() in ds_ht_clear_slots() ds_ht.c. After making this change I'm not getting locks anymore. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=275#comment786 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 9 months

[tracker] Task closed: not able to compile Kamailio 3.3.4

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#274 - not able to compile Kamailio 3.3.4 User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=274 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 9 months

[tracker] Comment added: not able to compile Kamailio 3.3.4

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#274 - not able to compile Kamailio 3.3.4 User who did this - Daniel-Constantin Mierla (miconda) ---------- It was actually about glib (standard c lib). Anyhow, from devel list this was sorted out, by using linux kernel instead of bsd one. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=274#comment785 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 9 months

packaging v4.0.0

by Daniel-Constantin Mierla

Hello, (cross-posting as this decision may be done properly with feedback from both developers and users community). Now that we have some band new modules but also several that were not packaged by Kamailio, just by ser (due to single modules directory), I was thinking we may want to reconsider a bit the packages we do for v4.0.0. 1) A new package is related to the bunch of IMS modules, that is pretty much obvious. 2) There are few modules targeting development samples or troubleshooting: print, print_lib and malloc_test - I think they should not be packaged. 3) I would create a special package for the modules using uid-based database schema: db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags uid_uri_db uri_db 4) Maybe we should merge some packages by dependencies: - a) some depend on libxml2: cpl-c xhttp_pi xmlrpc xmlops - b) some depend on libssl: tls auth_identity outbound 5) Some experimental modules with external deps will stay unpackaged like so far: db_oracle Opinions? Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, April 16-17, 2013, Berlin - http://conference.kamailio.com -

11 years, 9 months

git:master: sca: fix race condition when two endpoints seize same index simultaneously

by Andrew Mortensen

Module: sip-router Branch: master Commit: 522d06e75bf3c549af007701332f7db53a1b5ab6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=522d06e… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Feb 14 16:55:36 2013 -0500 sca: fix race condition when two endpoints seize same index simultaneously - return 480 Temporarily Unavailable to loser of race. --- modules/sca/sca_appearance.c | 45 +++++++++++++++++++++++++++++++++----- modules/sca/sca_appearance.h | 10 ++++++-- modules/sca/sca_call_info.c | 2 +- modules/sca/sca_reply.c | 14 +++++++++++- modules/sca/sca_subscribe.c | 49 ++++++++++++++++++++++++++--------------- 5 files changed, 91 insertions(+), 29 deletions(-) diff --git a/modules/sca/sca_appearance.c b/modules/sca/sca_appearance.c index 81e304c..f613630 100644 --- a/modules/sca/sca_appearance.c +++ b/modules/sca/sca_appearance.c @@ -347,11 +347,12 @@ done: sca_appearance * sca_appearance_seize_index_unsafe( sca_mod *scam, str *aor, str *owner_uri, - int app_idx, int slot_idx ) + int app_idx, int slot_idx, int *seize_error ) { sca_appearance_list *app_list; sca_appearance *app = NULL; sca_hash_slot *slot; + int error = SCA_APPEARANCE_ERR_UNKNOWN; slot = sca_hash_table_slot_for_index( scam->appearances, slot_idx ); @@ -368,9 +369,8 @@ sca_appearance_seize_index_unsafe( sca_mod *scam, str *aor, str *owner_uri, } } if ( app != NULL && app->index == app_idx ) { - LM_ERR( "sca_appearance_seize_index_unsafe: tried to seize in-use " - "%.*s appearance-index %d for %.*s", STR_FMT( aor ), - app_idx, STR_FMT( owner_uri )); + /* attempt to seize in-use appearance-index */ + error = SCA_APPEARANCE_ERR_INDEX_UNAVAILABLE; app = NULL; goto done; } @@ -379,16 +379,49 @@ sca_appearance_seize_index_unsafe( sca_mod *scam, str *aor, str *owner_uri, if ( app == NULL ) { LM_ERR( "Failed to create new appearance for %.*s at index %d", STR_FMT( owner_uri ), app_idx ); + error = SCA_APPEARANCE_ERR_MALLOC; goto done; } app->state = SCA_APPEARANCE_STATE_SEIZED; sca_appearance_list_insert_appearance( app_list, app ); + error = SCA_APPEARANCE_OK; + done: + if ( seize_error ) { + *seize_error = error; + } + return( app ); } + int +sca_appearance_seize_index( sca_mod *scam, str *aor, int idx, str *owner_uri ) +{ + sca_appearance *app; + int slot_idx; + int app_idx = -1; + int error = SCA_APPEARANCE_OK; + + slot_idx = sca_hash_table_index_for_key( scam->appearances, aor ); + sca_hash_table_lock_index( scam->appearances, slot_idx ); + + app = sca_appearance_seize_index_unsafe( scam, aor, owner_uri, + idx, slot_idx, &error ); + if ( app != NULL ) { + app_idx = app->index; + } + + sca_hash_table_unlock_index( scam->appearances, slot_idx ); + + if ( error == SCA_APPEARANCE_ERR_INDEX_UNAVAILABLE ) { + app_idx = SCA_APPEARANCE_INDEX_UNAVAILABLE; + } + + return( app_idx ); +} + sca_appearance * sca_appearance_seize_next_available_unsafe( sca_mod *scam, str *aor, str *owner_uri, int slot_idx ) @@ -856,7 +889,7 @@ sca_appearance_update_index( sca_mod *scam, str *aor, int idx, if ( app == NULL ) { LM_WARN( "Cannot update %.*s index %d to %.*s: index %d not in use", STR_FMT( aor ), idx, STR_FMT( &state_str ), idx ); - rc = SCA_APPEARANCE_ERR_INVALID_INDEX; + rc = SCA_APPEARANCE_ERR_INDEX_INVALID; goto done; } @@ -974,7 +1007,7 @@ sca_appearance_release_index( sca_mod *scam, str *aor, int idx ) if ( app == NULL ) { LM_ERR( "Failed to unlink %.*s appearance-index %d: invalid index", STR_FMT( aor ), idx ); - rc = SCA_APPEARANCE_ERR_INVALID_INDEX; + rc = SCA_APPEARANCE_ERR_INDEX_INVALID; goto done; } sca_appearance_free( app ); diff --git a/modules/sca/sca_appearance.h b/modules/sca/sca_appearance.h index e1d623b..0d0abd8 100644 --- a/modules/sca/sca_appearance.h +++ b/modules/sca/sca_appearance.h @@ -48,10 +48,13 @@ enum { enum { SCA_APPEARANCE_OK = 0, SCA_APPEARANCE_ERR_NOT_IN_USE = 0x1001, - SCA_APPEARANCE_ERR_INVALID_INDEX = 0x1002, - SCA_APPEARANCE_ERR_MALLOC = 0x1004, + SCA_APPEARANCE_ERR_INDEX_INVALID = 0x1002, + SCA_APPEARANCE_ERR_INDEX_UNAVAILABLE = 0x1004, + SCA_APPEARANCE_ERR_MALLOC = 0x1008, SCA_APPEARANCE_ERR_UNKNOWN = 0x1f00, }; +#define SCA_APPEARANCE_INDEX_UNAVAILABLE -2 + extern const str SCA_APPEARANCE_INDEX_STR; extern const str SCA_APPEARANCE_STATE_STR; @@ -98,7 +101,8 @@ void sca_appearance_state_to_str( int, str * ); int sca_appearance_state_from_str( str * ); sca_appearance *sca_appearance_seize_index_unsafe( sca_mod *, str *, str *, - int, int ); + int, int, int * ); +int sca_appearance_seize_index( sca_mod *, str *, int, str * ); int sca_appearance_seize_next_available_index( sca_mod *, str *, str * ); sca_appearance *sca_appearance_seize_next_available_unsafe( sca_mod *, str *, str *, int ); diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index bf8db04..1a360ca 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -777,7 +777,7 @@ sca_call_info_uri_update( str *aor, sca_call_info *call_info, rc = 1; } else { app = sca_appearance_seize_index_unsafe( sca, aor, contact_uri, - call_info->index, slot_idx ); + call_info->index, slot_idx, NULL ); if ( app == NULL ) { LM_ERR( "sca_call_info_uri_update: failed to seize index %d " "for %.*s", call_info->index, STR_FMT( contact_uri )); diff --git a/modules/sca/sca_reply.c b/modules/sca/sca_reply.c index dfe66e4..8da3a6e 100644 --- a/modules/sca/sca_reply.c +++ b/modules/sca/sca_reply.c @@ -76,7 +76,19 @@ sca_reply( sca_mod *scam, int status_code, char *status_msg, LM_ERR( "Failed to add Allow-Events and Expires headers" ); return( -1 ); } - } + } else if ( status_code == 480 ) { + /* tell loser of line-seize SUBSCRIBE race to try again shortly */ + extra_headers.s = hdr_buf; + len = snprintf( extra_headers.s, sizeof( hdr_buf ), + "Retry-After: %d%s", 1, CRLF ); + extra_headers.len = len; + + if ( add_lump_rpl( msg, extra_headers.s, extra_headers.len, + LUMP_RPL_HDR ) == NULL ) { + LM_ERR( "sca_reply: failed to add Retry-After header" ); + return( -1 ); + } + } if ( scam->sl_api->freply( msg, status_code, &status_str ) < 0 ) { LM_ERR( "Failed to send \"%d %s\" reply to %.*s", diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 36a4254..6337eba 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -1096,7 +1096,7 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) sca_subscription req_sub; sca_subscription *sub = NULL; sca_call_info call_info; - hdr_field_t *call_info_hdr; + hdr_field_t *call_info_hdr = NULL; str sub_key = STR_NULL; str *to_tag = NULL; char *status_text; @@ -1151,6 +1151,23 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) /* pkg_malloc'd in sca_subscription_copy_subscription_key above */ pkg_free( sub_key.s ); + if ( req_sub.event == SCA_EVENT_TYPE_LINE_SEIZE ) { + call_info_hdr = sca_call_info_header_find( msg->headers ); + if ( call_info_hdr ) { + if ( sca_call_info_body_parse( &call_info_hdr->body, + &call_info ) < 0 ) { + SCA_REPLY_ERROR( sca, 400, "Bad Request - " + "Invalid Call-Info header", msg ); + goto done; + } + app_idx = call_info.index; + } else { + SCA_REPLY_ERROR( sca, 400, "Bad Request - " + "missing Call-Info header", msg ); + goto done; + } + } + sca_hash_table_lock_index( sca->subscriptions, idx ); sub = sca_hash_table_index_kv_find_unsafe( sca->subscriptions, idx, @@ -1165,17 +1182,6 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) } if ( req_sub.event == SCA_EVENT_TYPE_LINE_SEIZE ) { - call_info_hdr = sca_call_info_header_find( msg->headers ); - if ( call_info_hdr ) { - if ( sca_call_info_body_parse( &call_info_hdr->body, - &call_info ) < 0 ) { - SCA_REPLY_ERROR( sca, 400, "Bad Request - " - "Invalid Call-Info header", msg ); - goto done; - } - app_idx = call_info.index; - } - if ( req_sub.expires == 0 ) { /* release the seized appearance */ if ( call_info_hdr == NULL ) { @@ -1192,13 +1198,17 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) } } else if ( SCA_STR_EMPTY( to_tag )) { /* don't seize new index if this is a line-seize reSUBSCRIBE */ - app_idx = sca_appearance_seize_next_available_index( sca, - &req_sub.target_aor, &req_sub.subscriber ); - if ( app_idx < 0 ) { + app_idx = sca_appearance_seize_index( sca, &req_sub.target_aor, + app_idx, &req_sub.subscriber ); + if ( app_idx == SCA_APPEARANCE_INDEX_UNAVAILABLE ) { + SCA_REPLY_ERROR( sca, 480, "Temporarily Unavailable", msg ); + goto done; + } else if ( app_idx < 0 ) { SCA_REPLY_ERROR( sca, 500, "Internal Server Error - " "seize appearance index", msg ); goto done; } + req_sub.index = app_idx; } } } else { @@ -1211,9 +1221,12 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) if ( req_sub.expires > 0 ) { if ( req_sub.event == SCA_EVENT_TYPE_LINE_SEIZE ) { - app_idx = sca_appearance_seize_next_available_index( sca, - &req_sub.target_aor, &req_sub.subscriber ); - if ( app_idx < 0 ) { + app_idx = sca_appearance_seize_index( sca, &req_sub.target_aor, + app_idx, &req_sub.subscriber ); + if ( app_idx == SCA_APPEARANCE_INDEX_UNAVAILABLE ) { + SCA_REPLY_ERROR( sca, 480, "Temporarily Unavailable", msg ); + goto done; + } else if ( app_idx < 0 ) { SCA_REPLY_ERROR( sca, 500, "Internal Server Error - " "seize appearance index", msg ); goto done;

11 years, 9 months

git:admorten/sca: sca: move SUBSCRIBE response handling to sca_subscription_reply

by Andrew Mortensen

Module: sip-router Branch: admorten/sca Commit: ceb7f0fa3c0da824cdd175de5fa6c17f26408131 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ceb7f0f… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Sun Mar 3 17:01:53 2013 -0500 sca: move SUBSCRIBE response handling to sca_subscription_reply - create necessary headers, pass to newly generic sca_reply function. --- modules/sca/sca_subscribe.c | 102 +++++++++++++++++++++++++++++++++---------- modules/sca/sca_subscribe.h | 5 ++ 2 files changed, 83 insertions(+), 24 deletions(-) diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 6337eba..904a3c5 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -1108,34 +1108,35 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) if ( parse_headers( msg, HDR_EOH_F, 0 ) < 0 ) { LM_ERR( "header parsing failed: bad request" ); - SCA_REPLY_ERROR( sca, 400, "Bad Request", msg ); + SCA_SUB_REPLY_ERROR( sca, 400, "Bad Request", msg ); return( -1 ); } if ( !STR_EQ( REQ_LINE( msg ).method, SCA_METHOD_SUBSCRIBE )) { LM_ERR( "bad request method %.*s", STR_FMT( &REQ_LINE( msg ).method )); - SCA_REPLY_ERROR( sca, 500, "Internal server error - config", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, "Internal server error - config", msg ); return( -1 ); } if ( SCA_HEADER_EMPTY( msg->event )) { - SCA_REPLY_ERROR( sca, 400, "Missing Event", msg ); + SCA_SUB_REPLY_ERROR( sca, 400, "Missing Event", msg ); return( -1 ); } event_type = sca_event_from_str( &msg->event->body ); if ( event_type == SCA_EVENT_TYPE_UNKNOWN ) { - SCA_REPLY_ERROR( sca, 400, "Bad Event", msg ); + SCA_SUB_REPLY_ERROR( sca, 400, "Bad Event", msg ); return( -1 ); } if ( sca_subscription_from_request( sca, msg, event_type, &req_sub ) < 0 ) { - SCA_REPLY_ERROR( sca, 400, "Bad Shared Call Appearance Request", msg ); + SCA_SUB_REPLY_ERROR( sca, 400, + "Bad Shared Call Appearance Request", msg ); return( -1 ); } if ( sca_subscription_copy_subscription_key( &req_sub, &sub_key ) < 0 ) { - SCA_REPLY_ERROR( sca, 500, - "Internal Server Error - copy dialog id", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, "Internal Server Error - " + "copy dialog id", msg ); goto done; } sca_subscription_print( &req_sub ); @@ -1156,13 +1157,13 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) if ( call_info_hdr ) { if ( sca_call_info_body_parse( &call_info_hdr->body, &call_info ) < 0 ) { - SCA_REPLY_ERROR( sca, 400, "Bad Request - " + SCA_SUB_REPLY_ERROR( sca, 400, "Bad Request - " "Invalid Call-Info header", msg ); goto done; } app_idx = call_info.index; } else { - SCA_REPLY_ERROR( sca, 400, "Bad Request - " + SCA_SUB_REPLY_ERROR( sca, 400, "Bad Request - " "missing Call-Info header", msg ); goto done; } @@ -1176,8 +1177,8 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) if ( sub != NULL ) { /* this will remove the subscription if expires == 0 */ if ( sca_subscription_update_unsafe( sca, sub, &req_sub, idx ) < 0 ) { - SCA_REPLY_ERROR( sca, 500, - "Internal Server Error - update subscription", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, "Internal Server Error - " + "update subscription", msg ); goto done; } @@ -1185,15 +1186,15 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) if ( req_sub.expires == 0 ) { /* release the seized appearance */ if ( call_info_hdr == NULL ) { - SCA_REPLY_ERROR( sca, 400, "Bad Request - " + SCA_SUB_REPLY_ERROR( sca, 400, "Bad Request - " "missing Call-Info header", msg ); goto done; } if ( sca_appearance_release_index( sca, &req_sub.target_aor, call_info.index ) != SCA_APPEARANCE_OK ) { - SCA_REPLY_ERROR( sca, 500, "Internal Server Error - " - "release seized line", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, "Internal Server Error - " + "release seized line", msg ); goto done; } } else if ( SCA_STR_EMPTY( to_tag )) { @@ -1201,11 +1202,12 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) app_idx = sca_appearance_seize_index( sca, &req_sub.target_aor, app_idx, &req_sub.subscriber ); if ( app_idx == SCA_APPEARANCE_INDEX_UNAVAILABLE ) { - SCA_REPLY_ERROR( sca, 480, "Temporarily Unavailable", msg ); + SCA_SUB_REPLY_ERROR( sca, 480, + "Temporarily Unavailable", msg ); goto done; } else if ( app_idx < 0 ) { - SCA_REPLY_ERROR( sca, 500, "Internal Server Error - " - "seize appearance index", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, + "Internal Server Error - seize appearance index", msg ); goto done; } req_sub.index = app_idx; @@ -1214,7 +1216,7 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) } else { /* in-dialog request, but we didn't find it. */ if ( !SCA_STR_EMPTY( to_tag )) { - SCA_REPLY_ERROR( sca, 481, + SCA_SUB_REPLY_ERROR( sca, 481, "Call Leg/Transaction Does Not Exist", msg ); goto done; } @@ -1224,10 +1226,11 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) app_idx = sca_appearance_seize_index( sca, &req_sub.target_aor, app_idx, &req_sub.subscriber ); if ( app_idx == SCA_APPEARANCE_INDEX_UNAVAILABLE ) { - SCA_REPLY_ERROR( sca, 480, "Temporarily Unavailable", msg ); + SCA_SUB_REPLY_ERROR( sca, 480, + "Temporarily Unavailable", msg ); goto done; } else if ( app_idx < 0 ) { - SCA_REPLY_ERROR( sca, 500, "Internal Server Error - " + SCA_SUB_REPLY_ERROR( sca, 500, "Internal Server Error - " "seize appearance index", msg ); goto done; } @@ -1236,8 +1239,8 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) if ( sca_subscription_save_unsafe( sca, &req_sub, idx, SCA_SUBSCRIPTION_CREATE_OPT_DEFAULT ) < 0 ) { - SCA_REPLY_ERROR( sca, 500, - "Internal Server Error - save subscription", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, "Internal Server Error - " + "save subscription", msg ); goto done; } } else { @@ -1252,9 +1255,9 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) status = sca_ok_status_for_event( event_type ); status_text = sca_ok_text_for_event( event_type ); - if ( sca_reply( sca, status, status_text, event_type, + if ( sca_subscription_reply( sca, status, status_text, event_type, req_sub.expires, msg ) < 0 ) { - SCA_REPLY_ERROR( sca, 500, "Internal server error", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, "Internal server error", msg ); goto done; } @@ -1296,6 +1299,57 @@ done: } int +sca_subscription_reply( sca_mod *scam, int status_code, char *status_msg, + int event_type, int expires, sip_msg_t *msg ) +{ + str extra_headers = STR_NULL; + char hdr_buf[ 1024 ]; + int len; + + if ( event_type != SCA_EVENT_TYPE_CALL_INFO && + event_type != SCA_EVENT_TYPE_LINE_SEIZE ) { + LM_ERR( "sca_subscription_reply: unrecognized event type %d", + event_type ); + return( -1 ); + } + + if ( status_code < 300 ) { + /* Add Event, Contact, Allow-Events and Expires headers */ + extra_headers.s = hdr_buf; + len = snprintf( extra_headers.s, sizeof( hdr_buf ), + "Event: %s%s", sca_event_name_from_type( event_type ), CRLF ); + if ( len >= sizeof( hdr_buf ) || len < 0 ) { + LM_ERR( "sca_subscription_reply: extra headers too long" ); + return( -1 ); + } + extra_headers.len = len; + + SCA_STR_APPEND_CSTR( &extra_headers, "Contact: " ); + SCA_STR_APPEND( &extra_headers, &REQ_LINE( msg ).uri ); + SCA_STR_APPEND_CSTR( &extra_headers, CRLF ); + + SCA_STR_COPY_CSTR( &extra_headers, + "Allow-Events: call-info, line-seize" CRLF ); + + len = snprintf( extra_headers.s + extra_headers.len, + sizeof( hdr_buf ) - extra_headers.len, + "Expires: %d%s", expires, CRLF ); + if ( len >= sizeof( hdr_buf ) || len < 0 ) { + LM_ERR( "sca_subscription_reply: extra headers too long" ); + return( -1 ); + } + } else if ( status_code == 480 ) { + /* tell loser of line-seize SUBSCRIBE race to try again shortly */ + extra_headers.s = hdr_buf; + len = snprintf( extra_headers.s, sizeof( hdr_buf ), + "Retry-After: %d%s", 1, CRLF ); + extra_headers.len = len; + } + + return( sca_reply( scam, status_code, status_msg, &extra_headers, msg )); +} + + int sca_subscription_terminate( sca_mod *scam, str *aor, int event, str *subscriber, int termination_state, int opts ) { diff --git a/modules/sca/sca_subscribe.h b/modules/sca/sca_subscribe.h index 2d36248..e238bf3 100644 --- a/modules/sca/sca_subscribe.h +++ b/modules/sca/sca_subscribe.h @@ -74,7 +74,12 @@ extern const str SCA_METHOD_SUBSCRIBE; ((sub1)->state >= SCA_SUBSCRIPTION_STATE_TERMINATED && \ (sub1)->state <= SCA_SUBSCRIPTION_STATE_TERMINATED_TIMEOUT ) +#define SCA_SUB_REPLY_ERROR( mod, scode, smsg, sreply ) \ + sca_subscription_reply((mod), (scode), (smsg), \ + SCA_EVENT_TYPE_CALL_INFO, -1, (sreply)) + int sca_handle_subscribe( sip_msg_t *, char *, char * ); +int sca_subscription_reply( sca_mod *, int, char *, int, int, sip_msg_t * ); int sca_subscription_from_db_result( db1_res_t *, sca_subscription * ); int sca_subscriptions_restore_from_db( sca_mod * );

11 years, 9 months

git:admorten/sca: sca: make sca_reply a generic reply function.

by Andrew Mortensen

Module: sip-router Branch: admorten/sca Commit: 36b6571500880d046064ed05a22ce225bf45e9db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36b6571… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Sun Mar 3 16:59:23 2013 -0500 sca: make sca_reply a generic reply function. - take a pre-filled extra_headers parameter instead, add with add_lump_rpl. --- modules/sca/sca_reply.c | 55 ++++++----------------------------------------- modules/sca/sca_reply.h | 5 +-- 2 files changed, 9 insertions(+), 51 deletions(-) diff --git a/modules/sca/sca_reply.c b/modules/sca/sca_reply.c index 8da3a6e..3e2f910 100644 --- a/modules/sca/sca_reply.c +++ b/modules/sca/sca_reply.c @@ -31,63 +31,22 @@ int sca_reply( sca_mod *scam, int status_code, char *status_msg, - int event_type, int expires, sip_msg_t *msg ) + str *extra_headers, sip_msg_t *msg ) { str status_str = STR_NULL; - str extra_headers = STR_NULL; - char hdr_buf[ 1024 ]; - int len; assert( scam != NULL && scam->sl_api != NULL ); assert( msg != NULL ); - if ( event_type != SCA_EVENT_TYPE_CALL_INFO && - event_type != SCA_EVENT_TYPE_LINE_SEIZE ) { - LM_ERR( "Unrecognized event type %d", event_type ); - return( -1 ); - } - status_str.s = status_msg; status_str.len = strlen( status_msg ); - if ( status_code < 300 ) { - /* Add Event, Contact, Allow-Events and Expires headers */ - extra_headers.s = hdr_buf; - len = snprintf( extra_headers.s, sizeof( hdr_buf ), - "Event: %s%s", sca_event_name_from_type( event_type ), CRLF ); - extra_headers.len = len; - - SCA_STR_APPEND_CSTR( &extra_headers, "Contact: " ); - SCA_STR_APPEND( &extra_headers, &REQ_LINE( msg ).uri ); - SCA_STR_APPEND_CSTR( &extra_headers, CRLF ); - - SCA_STR_COPY_CSTR( &extra_headers, - "Allow-Events: call-info, line-seize" CRLF ); - - SCA_STR_COPY_CSTR( &extra_headers, "Expires: " ); - - len = snprintf( extra_headers.s + extra_headers.len, - sizeof( hdr_buf ) - extra_headers.len, - "%d%s", expires, CRLF ); - extra_headers.len += len; - - if ( add_lump_rpl( msg, extra_headers.s, extra_headers.len, - LUMP_RPL_HDR ) == NULL ) { - LM_ERR( "Failed to add Allow-Events and Expires headers" ); - return( -1 ); - } - } else if ( status_code == 480 ) { - /* tell loser of line-seize SUBSCRIBE race to try again shortly */ - extra_headers.s = hdr_buf; - len = snprintf( extra_headers.s, sizeof( hdr_buf ), - "Retry-After: %d%s", 1, CRLF ); - extra_headers.len = len; - - if ( add_lump_rpl( msg, extra_headers.s, extra_headers.len, - LUMP_RPL_HDR ) == NULL ) { - LM_ERR( "sca_reply: failed to add Retry-After header" ); - return( -1 ); - } + if ( extra_headers && extra_headers->len ) { + if ( add_lump_rpl( msg, extra_headers->s, extra_headers->len, + LUMP_RPL_HDR ) == NULL ) { + LM_ERR("sca_subscription_reply: failed to add Retry-After header"); + return( -1 ); + } } if ( scam->sl_api->freply( msg, status_code, &status_str ) < 0 ) { diff --git a/modules/sca/sca_reply.h b/modules/sca/sca_reply.h index a8b1131..e2c5d1a 100644 --- a/modules/sca/sca_reply.h +++ b/modules/sca/sca_reply.h @@ -28,9 +28,8 @@ #include "sca.h" #define SCA_REPLY_ERROR( mod, scode, smsg, sreply ) \ - sca_reply((mod), (scode), (smsg), SCA_EVENT_TYPE_CALL_INFO, -1, \ - (sreply)) + sca_reply((mod), (scode), (smsg), NULL, (sreply)) -int sca_reply( sca_mod *, int, char *, int, int, sip_msg_t * ); +int sca_reply( sca_mod *, int, char *, str *, sip_msg_t * ); #endif /* SCA_REPLY_H */

11 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013