[sr-dev] git:tmp/interconnectroute_module:296913c3: tmp/interconnectroute_module: added service code and leg info to inner query

Module: kamailio Branch: tmp/interconnectroute_module Commit: 296913c336259d769eb4135b459482d87d1d9fe5 URL: https://github.com/kamailio/kamailio/commit/296913c336259d769eb4135b459482d… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-03-19T15:02:20+02:00 tmp/interconnectroute_module: added service code and leg info to inner query --- Modified: modules/interconnectroute/db.c --- Diff: https://github.com/kamailio/kamailio/commit/296913c336259d769eb4135b459482d… Patch: https://github.com/kamailio/kamailio/commit/296913c336259d769eb4135b459482d… --- diff --git a/modules/interconnectroute/db.c b/modules/interconnectroute/db.c index 4a8fd99..7a2f78e 100644 --- a/modules/interconnectroute/db.c +++ b/modules/interconnectroute/db.c @@ -25,6 +25,7 @@ static char *orig_route_data_query = "select TFROM.INTERNAL_ID as FROM_TRUNK_ID, "SELECT FROM_INTERCONNECT_PARTNER_ID AS IPID, PRIORITY " "FROM service_rate " "WHERE '%.*s' like concat(FROM_PREFIX,'%') " +" AND SERVICE_CODE = '%.*s' AND LEG='%.*s' " "ORDER BY length(FROM_PREFIX) desc limit 1 " ") " ") " @@ -45,6 +46,7 @@ static char *orig_route_data_query = "select TFROM.INTERNAL_ID as FROM_TRUNK_ID, "UNION " "( " "SELECT TO_INTERCONNECT_PARTNER_ID AS IPID, PRIORITY " +" AND SERVICE_CODE = '%.*s' AND LEG='%.*s' " "FROM service_rate " "WHERE '%.*s' like concat(TO_PREFIX,'%') " "ORDER BY length(TO_PREFIX) desc limit 1 " @@ -78,6 +80,7 @@ static char *term_route_data_query = "select TFROM.INTERNAL_ID as FROM_TRUNK_ID, "SELECT FROM_INTERCONNECT_PARTNER_ID AS IPID, PRIORITY " "FROM service_rate " "WHERE '%.*s' like concat(FROM_PREFIX,'%') " +" AND SERVICE_CODE = '%.*s' AND LEG='%.*s' " "ORDER BY length(FROM_PREFIX) desc limit 1 " ") " ") " @@ -100,6 +103,7 @@ static char *term_route_data_query = "select TFROM.INTERNAL_ID as FROM_TRUNK_ID, "SELECT TO_INTERCONNECT_PARTNER_ID AS IPID, PRIORITY " "FROM service_rate " "WHERE '%.*s' like concat(TO_PREFIX,'%') " +" AND SERVICE_CODE = '%.*s' AND LEG='%.*s' " "ORDER BY length(TO_PREFIX) desc limit 1 " ") " ") " @@ -171,13 +175,16 @@ int get_orig_route_data(str* a_number, str* b_number, str* leg, str* sc, ix_rout int num_rows; - if (strlen(orig_route_data_query) + a_number->len + a_number->len + b_number->len + b_number->len + leg->len + sc->len > QUERY_LEN) { + if (strlen(orig_route_data_query) + a_number->len + a_number->len + b_number->len + b_number->len + (3*leg->len) + (3*sc->len) > QUERY_LEN) { LM_ERR("query too big\n"); return -1; } - snprintf(query, QUERY_LEN, orig_route_data_query, a_number->len, a_number->s, a_number->len, a_number->s, b_number->len, b_number->s, - b_number->len, b_number->s, sc->len, sc->s, leg->len, leg->s); + snprintf(query, QUERY_LEN, orig_route_data_query, a_number->len, a_number->s, a_number->len, a_number->s, + sc->len, sc->s, leg->len, leg->s, + b_number->len, b_number->s, + sc->len, sc->s, leg->len, leg->s, + b_number->len, b_number->s, sc->len, sc->s, leg->len, leg->s); query_s.s = query; query_s.len = strlen(query); @@ -265,13 +272,16 @@ int get_term_route_data(str* a_number, str* b_number, str* leg, str* sc, str* ex int num_rows; - if (strlen(term_route_data_query) + a_number->len + a_number->len + b_number->len + a_number->len + leg->len + sc->len + ext_trunk_id->len > QUERY_LEN) { + if (strlen(term_route_data_query) + a_number->len + a_number->len + b_number->len + a_number->len + (3*leg->len) + (3*sc->len) + ext_trunk_id->len > QUERY_LEN) { LM_ERR("query too big\n"); return -1; } - snprintf(query, QUERY_LEN, term_route_data_query, a_number->len, a_number->s, a_number->len, a_number->s, b_number->len, b_number->s, - b_number->len, b_number->s, sc->len, sc->s, leg->len, leg->s, ext_trunk_id->len, ext_trunk_id->s); + snprintf(query, QUERY_LEN, term_route_data_query, a_number->len, a_number->s, a_number->len, a_number->s, + sc->len, sc->s, leg->len, leg->s, + b_number->len, b_number->s, + b_number->len, b_number->s, sc->len, sc->s, leg->len, leg->s, + sc->len, sc->s, leg->len, leg->s, ext_trunk_id->len, ext_trunk_id->s); query_s.s = query; query_s.len = strlen(query);