|
@@ -27,7 +27,7 @@ loadmodule "/usr/local/lib/ser/modules/registrar.so"
|
|
|
loadmodule "/usr/local/lib/ser/modules/avpops.so"
|
|
|
loadmodule "/usr/local/lib/ser/modules/fifo.so"
|
|
|
loadmodule "/usr/local/lib/ser/modules/options.so"
|
|
|
-loadmodule "/usr/local/lib/ser/modules/xlog.so"
|
|
|
+loadmodule "/usr/local/lib/ser/modules/xprint.so"
|
|
|
# Load OSP module
|
|
|
loadmodule "/usr/local/lib/ser/modules/osp.so"
|
|
|
|
|
@@ -150,17 +150,17 @@ modparam("tm", "fr_inv_timer", 30000)
|
|
|
|
|
|
# main routing logic
|
|
|
route{
|
|
|
- xlog("L_INFO", "----ROUTE: Route IN - M=%rm RURI=%ru F=%fu T=%tu IP=%si ID=$ci\n");
|
|
|
+ xplog("L_INFO", "----ROUTE: Route IN - M=%rm RURI=%ru F=%fu T=%tu IP=%si ID=$ci\n");
|
|
|
|
|
|
# initial sanity checks
|
|
|
if (!mf_process_maxfwd_header("10")) {
|
|
|
- xlog("L_WARN", "----ROUTE: Too many hops, $rm from '%fu' to '%tu'\n");
|
|
|
+ xplog("L_WARN", "----ROUTE: Too many hops, $rm from '%fu' to '%tu'\n");
|
|
|
sl_send_reply("483", "Too Many Hops");
|
|
|
break;
|
|
|
};
|
|
|
|
|
|
if (msg:len >= max_len) {
|
|
|
- xlog("L_WARN", "----ROUTE: Message too big, $rm from '%fu' to '%tu'\n");
|
|
|
+ xplog("L_WARN", "----ROUTE: Message too big, $rm from '%fu' to '%tu'\n");
|
|
|
sl_send_reply("513", "Message Too Big");
|
|
|
break;
|
|
|
};
|
|
@@ -192,13 +192,13 @@ route{
|
|
|
}
|
|
|
} else {
|
|
|
if (method=="BYE") {
|
|
|
- xlog("L_WARN", "----ROUTE: Processing BYE without route header - F=$fu T=$tu IP=$si ID=$ci\n");
|
|
|
+ xplog("L_WARN", "----ROUTE: Processing BYE without route header - F=$fu T=$tu IP=$si ID=$ci\n");
|
|
|
if (t_lookup_request()) {
|
|
|
log(2, "----ROUTE: Duplicated BYE\n");
|
|
|
} else {
|
|
|
# NOTE - don't t_relay before reporting usage
|
|
|
if (!reportospusage()) {
|
|
|
- xlog("L_WARN", "----ROUTE: failed to report usage, from '%fu' to '%tu'\n");
|
|
|
+ xplog("L_WARN", "----ROUTE: failed to report usage, from '%fu' to '%tu'\n");
|
|
|
}
|
|
|
sl_send_reply("400", "Bad Request - no route header in BYE message");
|
|
|
}
|
|
@@ -286,7 +286,7 @@ route{
|
|
|
|
|
|
# NOTE - don't t_relay before reporting usage
|
|
|
if (!reportospusage()) {
|
|
|
- xlog("L_WARN", "----ROUTE: failed to report usage, from '%fu' to '%tu'\n");
|
|
|
+ xplog("L_WARN", "----ROUTE: failed to report usage, from '%fu' to '%tu'\n");
|
|
|
}
|
|
|
|
|
|
t_relay();
|
|
@@ -296,7 +296,7 @@ route{
|
|
|
if (t_lookup_request()) {
|
|
|
t_relay();
|
|
|
} else {
|
|
|
- xlog("L_WARN", "----ROUTE: CANCEL without matching transaction, from '$fu' to '$tu'\n");
|
|
|
+ xplog("L_WARN", "----ROUTE: CANCEL without matching transaction, from '$fu' to '$tu'\n");
|
|
|
}
|
|
|
} else if ((method=="OPTIONS") && (uri==myself)) {
|
|
|
log(2, "----ROUTE: Processing OPTIONS\n");
|
|
@@ -324,7 +324,7 @@ route{
|
|
|
# sl_send_reply("488", "Unknown Domain");
|
|
|
# }
|
|
|
} else {
|
|
|
- xlog("L_WARN", "----ROUTE: Unsupported message, $rm from '%fu' to '%tu'\n");
|
|
|
+ xplog("L_WARN", "----ROUTE: Unsupported message, $rm from '%fu' to '%tu'\n");
|
|
|
sl_send_reply("500", "Unsupported Message");
|
|
|
}
|
|
|
|
|
@@ -364,10 +364,10 @@ route[2] {
|
|
|
# route(4);
|
|
|
route(5);
|
|
|
} else if ($retcode == -403) {
|
|
|
- xlog("L_WARN", "----ROUTE: Call to '%tu' from source device '%si' is blocked on OSP Server.\n");
|
|
|
+ xplog("L_WARN", "----ROUTE: Call to '%tu' from source device '%si' is blocked on OSP Server.\n");
|
|
|
sl_send_reply("403", "Forbidden - Call is blocked");
|
|
|
} else if ($retcode == -404) {
|
|
|
- xlog("L_WARN", "----ROUTE: No route on OSP server for call to '%tu' from source device '%si'.\n");
|
|
|
+ xplog("L_WARN", "----ROUTE: No route on OSP server for call to '%tu' from source device '%si'.\n");
|
|
|
sl_send_reply("404", "Route Not Found");
|
|
|
} else if ($retcode == -500) {
|
|
|
log(3, "----ROUTE: Internal Server Error\n");
|
|
@@ -451,7 +451,7 @@ failure_route[1] {
|
|
|
|
|
|
t_relay();
|
|
|
} else {
|
|
|
- xlog("L_WARN", "----ROUTE: All destinations attempted for call ID '%ci'. Call cannot be completed.\n");
|
|
|
+ xplog("L_WARN", "----ROUTE: All destinations attempted for call ID '%ci'. Call cannot be completed.\n");
|
|
|
t_reply("503", "Service Not Available - Call cannot be completed");
|
|
|
}
|
|
|
}
|