[sr-dev] git:5.2:60aa0d9f: cfgt: fix detection of jump to previous-previous route

Module: kamailio Branch: 5.2 Commit: 60aa0d9fd7b3a53154b10eedcd0c51d51c6e0035 URL: https://github.com/kamailio/kamailio/commit/60aa0d9fd7b3a53154b10eedcd0c51d… Author: Marco Capetta &lt;mcapetta(a)sipwise.com&gt; Committer: Victor Seva &lt;linuxmaniac(a)torreviejawireless.org&gt; Date: 2019-11-29T09:32:03+01:00 cfgt: fix detection of jump to previous-previous route * this happends with onsend_route (cherry picked from commit e0ed91acb88091caf285704689f72e48c5127ae4) --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/60aa0d9fd7b3a53154b10eedcd0c51d… Patch: https://github.com/kamailio/kamailio/commit/60aa0d9fd7b3a53154b10eedcd0c51d… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 0e3bfecb5d..3e6f5b8c2a 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -329,7 +329,7 @@ void cfgt_save_node(cfgt_node_p node) } dest.s[dir] = '\0'; LM_DBG("dir [%s]\n", dest.s); - if (stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { + if(stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { LM_DBG("dir [%s] already existing\n", dest.s); } else if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno)); @@ -467,9 +467,15 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) } else { LM_DBG("actual routename:[%.*s][%d]\n", node->route->s.len, node->route->s.s, node->route->type); - if(node->route->prev) + if(node->route->prev) { + if(node->route->prev->prev) + LM_DBG("prev prev routename:[%.*s][%d]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s, + node->route->prev->prev->type); LM_DBG("prev routename:[%.*s][%d]\n", node->route->prev->s.len, node->route->prev->s.s, node->route->prev->type); + } if(node->route->next) LM_DBG("next routename:[%.*s][%d]\n", node->route->next->s.len, node->route->next->s.s, node->route->next->type); @@ -477,12 +483,20 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) LM_DBG("same route\n"); _cfgt_set_type(node->route, a); return 2; - } else if(node->route->prev - && STR_EQ(*routename, node->route->prev->s)) { - LM_DBG("back to route[%.*s]\n", node->route->prev->s.len, - node->route->prev->s.s); - _cfgt_set_type(node->route->prev, a); - return 3; + } else if(node->route->prev) { + if(STR_EQ(*routename, node->route->prev->s)) { + LM_DBG("back to prev route[%.*s]\n", node->route->prev->s.len, + node->route->prev->s.s); + _cfgt_set_type(node->route->prev, a); + return 3; + } else if(node->route->prev->prev + && STR_EQ(*routename, node->route->prev->prev->s)) { + LM_DBG("back to prev prev route[%.*s]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s); + _cfgt_set_type(node->route->prev->prev, a); + return 3; + } } route = pkg_malloc(sizeof(cfgt_str_list_t)); if(!route) { @@ -490,6 +504,9 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) return -1; } memset(route, 0, sizeof(cfgt_str_list_t)); + if(route->prev && node->route->prev) { + route->prev->prev = node->route->prev; + } route->prev = node->route; node->route->next = route; node->route = route;