<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15654] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15654">15654</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-11-24 10:11:56 -0600 (Tue, 24 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre> <a href="http://jira.freeswitch.org/browse/MODSOFIA-41">MODSOFIA-41</a> , fail2ban support in mod_sofia thanks jay binks. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkconfsip_profilesinternalxml">freeswitch/trunk/conf/sip_profiles/internal.xml</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_regc">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkconfsip_profilesinternalxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/sip_profiles/internal.xml (15653 => 15654)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/conf/sip_profiles/internal.xml 2009-11-24 06:01:43 UTC (rev 15653)
+++ freeswitch/trunk/conf/sip_profiles/internal.xml 2009-11-24 16:11:56 UTC (rev 15654)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> <!-- <param name="user-agent-string" value="FreeSWITCH Rocks!"/> -->
</span><span class="cx"> <param name="debug" value="0"/>
</span><span class="cx"> <param name="sip-trace" value="no"/>
</span><ins>+ <param name="log-auth-failures" value="true"/>
</ins><span class="cx"> <param name="context" value="public"/>
</span><span class="cx"> <param name="rfc2833-pt" value="101"/>
</span><span class="cx"> <!-- port to bind to for sip traffic -->
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (15653 => 15654)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-11-24 06:01:43 UTC (rev 15653)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-11-24 16:11:56 UTC (rev 15654)
</span><span class="lines">@@ -517,6 +517,7 @@
</span><span class="cx"> uint32_t timer_t4;
</span><span class="cx"> char *contact_user;
</span><span class="cx"> char *local_network;
</span><ins>+ int log_auth_failures;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct private_object {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15653 => 15654)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-11-24 06:01:43 UTC (rev 15653)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-11-24 16:11:56 UTC (rev 15654)
</span><span class="lines">@@ -1845,7 +1845,7 @@
</span><span class="cx"> profile->ib_calls = 0;
</span><span class="cx"> profile->ob_calls = 0;
</span><span class="cx"> profile->ib_failed_calls = 0;
</span><del>- profile->ob_failed_calls = 0;
</del><ins>+ profile->ob_failed_calls = 0;
</ins><span class="cx">
</span><span class="cx"> if (xprofiledomain) {
</span><span class="cx"> profile->domain_name = switch_core_strdup(profile->pool, xprofiledomain);
</span><span class="lines">@@ -1887,6 +1887,8 @@
</span><span class="cx"> profile->user_agent = switch_core_strdup(profile->pool, val);
</span><span class="cx"> } else if (!strcasecmp(var, "auto-restart")) {
</span><span class="cx"> profile->auto_restart = switch_true(val);
</span><ins>+ } else if (!strcasecmp(var, "log-auth-failures")) {
+ profile->log_auth_failures = switch_true(val);
</ins><span class="cx"> } else if (!strcasecmp(var, "dtmf-type")) {
</span><span class="cx"> if (!strcasecmp(val, "rfc2833")) {
</span><span class="cx"> profile->dtmf_type = DTMF_2833;
</span><span class="lines">@@ -2415,6 +2417,7 @@
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_PASS_CALLEE_ID);
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_MESSAGE_QUERY_ON_FIRST_REGISTER);
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_SQL_IN_TRANS);
</span><ins>+ profile->log_auth_failures = 0;
</ins><span class="cx">
</span><span class="cx"> for (param = switch_xml_child(settings, "param"); param; param = param->next) {
</span><span class="cx"> char *var = (char *) switch_xml_attr_soft(param, "name");
</span><span class="lines">@@ -2442,6 +2445,8 @@
</span><span class="cx"> profile->user_agent = switch_core_strdup(profile->pool, val);
</span><span class="cx"> } else if (!strcasecmp(var, "auto-restart")) {
</span><span class="cx"> profile->auto_restart = switch_true(val);
</span><ins>+ } else if (!strcasecmp(var, "log-auth-failures")) {
+ profile->log_auth_failures = switch_true(val);
</ins><span class="cx"> } else if (!strcasecmp(var, "dtmf-type")) {
</span><span class="cx"> if (!strcasecmp(val, "rfc2833")) {
</span><span class="cx"> profile->dtmf_type = DTMF_2833;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_regc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (15653 => 15654)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2009-11-24 06:01:43 UTC (rev 15653)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2009-11-24 16:11:56 UTC (rev 15654)
</span><span class="lines">@@ -446,10 +446,13 @@
</span><span class="cx"> event = "check-sync;reboot=true";
</span><span class="cx"> } else if (switch_stristr("linksys", user_agent)) {
</span><span class="cx"> event = "reboot_now";
</span><ins>+ } else if (switch_stristr("aastra", user_agent)) {
+ event = "aastra-check-cfg";
+ } else if (switch_stristr("polycom", user_agent)) {
+ event = "polycom-reboot";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sofia_glue_send_notify(profile, user, host, event, contenttype, body, contact, network_ip);
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int sofia_sla_dialog_del_callback(void *pArg, int argc, char **argv, char **columnNames)
</span><span class="lines">@@ -928,7 +931,6 @@
</span><span class="cx"> if (*received_data && sofia_test_pflag(profile, PFLAG_RECIEVED_IN_NAT_REG_CONTACT)) {
</span><span class="cx"> switch_snprintf(received_data, sizeof(received_data), ";received=%s:%d", url_ip, network_port);
</span><span class="cx"> }
</span><del>-
</del><span class="cx">
</span><span class="cx"> if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") ||
</span><span class="cx"> !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-tls-connectile-dysfunction")) {
</span><span class="lines">@@ -972,6 +974,17 @@
</span><span class="cx"> }
</span><span class="cx"> if (auth_res == AUTH_FORBIDDEN) {
</span><span class="cx"> nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END());
</span><ins>+
+ /* Log line added to support Fail2Ban */
+ if ( profile->log_auth_failures ) {
+ if (regtype == REG_REGISTER) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "SIP auth failure (REGISTER) on sofia profile '%s' "
+ "for [%s@%s] from ip %s\n", profile->name, to_user, to_host, network_ip);
+ } else if (regtype == REG_INVITE) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "SIP auth failure (INVITE) on sofia profile '%s' "
+ "for [%s@%s] from ip %s\n", profile->name, to_user, to_host, network_ip);
+ }
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> nua_respond(nh, SIP_401_UNAUTHORIZED, NUTAG_WITH_THIS(nua), TAG_END());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>