Skip to content

Commit

Permalink
modules/ims_usrloc_scscf: correctly read and reference subscription w…
Browse files Browse the repository at this point in the history 
…hen reading from DB
  • Loading branch information
@jaybeepee
jaybeepee committed Jul 14, 2016
1 parent b4d2be7 commit b2fb56f
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 24 deletions.
1 change: 1 addition & 0 deletions modules/ims_usrloc_scscf/bin_utils.c
View file
Expand Up @@ -882,6 +882,7 @@ ims_subscription *bin_decode_ims_subscription(bin_data *x)
goto error;
}
memset(imss,0,sizeof(ims_subscription));
imss->sl = -1; /* we set this to -1 as it's not currently in a slot at creation stage */

if (!bin_decode_str(x,&s)||!str_shm_dup(&(imss->private_identity),&s)) goto error;
if (!bin_decode_ushort(x, &(imss->service_profiles_cnt))) goto error;
Expand Down
2 changes: 2 additions & 0 deletions modules/ims_usrloc_scscf/impurecord.h
View file
Expand Up @@ -180,5 +180,7 @@ void unref_subscription_unsafe(ims_subscription* s);
void ref_subscription(ims_subscription* s);
void unref_subscription(ims_subscription* s);

int compare_subscription(ims_subscription* new, ims_subscription* orig);

#endif

80 changes: 56 additions & 24 deletions modules/ims_usrloc_scscf/usrloc_db.c
View file
Expand Up @@ -668,12 +668,14 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) {
}, blob = {0, 0}, contact = {0, 0}, presentity_uri = {0, 0};
bin_data x;
ims_subscription* subscription = 0;
ims_subscription* found_subscription = 0;
impurecord_t* impurecord;
int impu_id_len;
ucontact_t* c;
ucontact_info_t contact_data;
subscriber_data_t subscriber_data;
reg_subscriber *reg_subscriber;
int must_unref_subscription = 0;

/*
* the two queries - get the IMPUs, then get associated contacts for each IMPU:
Expand Down Expand Up @@ -781,25 +783,50 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) {
if (!VAL_NULL(vals + 8)) {
impu_id = VAL_INT(vals + 8);
}


int leave_slot_locked = 1;
int res = get_subscription(&subscription->private_identity, &found_subscription, leave_slot_locked); //leave slot locked in case we need to add.... don't want racing adds
if (res != 0) {
LM_DBG("No subscription yet for [%.*s]... adding\n", subscription->private_identity.len, subscription->private_identity.s);
ref_subscription_unsafe(subscription); //we reference coz we are using it - will be unreferenced later.
add_subscription_unsafe(subscription);
unlock_subscription_slot(subscription->sl);
} else {
//TODO: we may want to do a deep comparison of the subscription and update....
if (compare_subscription(subscription, found_subscription) != 0) {
unref_subscription_unsafe(subscription); /*we don't need this one from the DB - don't leak it */
subscription = found_subscription;
} else {
// Treat it as a new Subscription - it's not the same as the previous one
ref_subscription_unsafe(subscription); //we reference coz we are using it - will be unreferenced later.
add_subscription_unsafe(subscription);
}
ref_subscription_unsafe(subscription); /*assume we will add to impu - if not, we will unref it*/
unlock_subscription_slot(subscription->sl);
}

/* insert impu into memory */
lock_udomain(_d, &impu);
if (get_impurecord_unsafe(_d, &impu, &impurecord) != 0) {
if (mem_insert_impurecord(_d, &impu, &subscription->private_identity,reg_state, barring,
&subscription, &ccf1, &ccf2, &ecf1, &ecf2, &impurecord)
!= 0) {
LM_ERR("Unable to insert IMPU into memory [%.*s]\n", impu.len, impu.s);
if (mem_insert_impurecord(_d, &impu, &subscription->private_identity,reg_state, barring,
&subscription, &ccf1, &ccf2, &ecf1, &ecf2, &impurecord)
!= 0) {
LM_ERR("Unable to insert IMPU into memory [%.*s]\n", impu.len, impu.s);
}
/* run the INSERTion callback so REGISTRAR can get into sync - ie subscribe for callbacks on the IMPU.... for NOTIFYs for example*/
run_ul_callbacks(NULL, UL_IMPU_INSERT, impurecord, NULL);
} else {
/* unref the unused subscription*/
must_unref_subscription = 1;
}
/* run the INSERTion callback so REGISTRAR can get into sync - ie subscribe for callbacks on the IMPU.... for NOTIFYs for example*/
run_ul_callbacks(NULL, UL_IMPU_INSERT, impurecord, NULL);
}

/* add contacts */
if (impu_id < 0) {
LM_ERR("impu_id has not been set [%.*s] - we cannot read contacts or subscribers from DB....aborting preload\n", impu.len, impu.s);
//TODO: check frees
unlock_udomain(_d, &impu);
continue;
LM_ERR("impu_id has not been set [%.*s] - we cannot read contacts or subscribers from DB....aborting preload\n", impu.len, impu.s);
//TODO: check frees
unlock_udomain(_d, &impu);
unref_subscription(subscription);
continue;
}
impu_id_len = int_to_str_len(impu_id);
len = query_contact.len + impu_id_len + 1/*nul*/;
Expand All @@ -812,6 +839,7 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) {
LM_ERR("mo more pkg mem\n");
//TODO: check free
unlock_udomain(_d, &impu);
unref_subscription(subscription);
return -1;
}
query_buffer_len = len;
Expand Down Expand Up @@ -906,12 +934,14 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) {
impu.len, impu.s);
ul_dbf.free_result(_c, subscriber_rs);
unlock_udomain(_d, &impu);
unref_subscription(subscription);
continue;
}
if (RES_ROW_N(subscriber_rs) == 0) {
LM_DBG("no subscriber associated with impu [%.*s]\n", impu.len, impu.s);
ul_dbf.free_result(_c, subscriber_rs);
unlock_udomain(_d, &impu);
unref_subscription(subscription);
continue;
}

Expand Down Expand Up @@ -954,25 +984,27 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) {
ul_dbf.free_result(_c, subscriber_rs);

unlock_udomain(_d, &impu);
if (must_unref_subscription)
unref_subscription(subscription);

}

if (DB_CAPABILITY(ul_dbf, DB_CAP_FETCH)) {
if (ul_dbf.fetch_result(_c, &rs, ul_fetch_rows) < 0) {
LM_ERR("fetching rows (1) failed\n");
ul_dbf.free_result(_c, rs);
return -1;
}
} else {
break;
}
} while (RES_ROW_N(rs) > 0);
if (ul_dbf.fetch_result(_c, &rs, ul_fetch_rows) < 0) {
LM_ERR("fetching rows (1) failed\n");
ul_dbf.free_result(_c, rs);
return -1;
}
} else {
break;
}
} while (RES_ROW_N(rs) > 0);

ul_dbf.free_result(_c, rs);
ul_dbf.free_result(_c, rs);

LM_DBG("Completed preload_udomain");
LM_DBG("Completed preload_udomain");

return 0;
return 0;
}

int db_link_contact_to_impu(impurecord_t* _r, ucontact_t* _c) {
Expand Down

0 comments on commit b2fb56f

Please sign in to comment.