Skip to content

Commit

Permalink
outbound: removed references to lib kmi - not used
Browse files Browse the repository at this point in the history
  • Loading branch information
miconda committed Jan 2, 2017
1 parent fddaf63 commit ad2341a
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 39 deletions.
3 changes: 0 additions & 3 deletions src/modules/outbound/Makefile
Expand Up @@ -49,7 +49,4 @@ LIBS+= $(TLS_EXTRA_LIBS)
#LIBS+= /usr/lib/libcurl.a /usr/lib/libssl.a /usr/lib/libcrypto.a -lkrb5 -lidn -lz -lgssapi_krb5 -lrt
DEFS+=-DKAMAILIO_MOD_INTERFACE

SERLIBPATH=../../lib
SER_LIBS+=$(SERLIBPATH)/kmi/kmi

include ../../Makefile.modules
6 changes: 2 additions & 4 deletions src/modules/outbound/api.h
@@ -1,6 +1,4 @@
/*
* $Id$
*
* Copyright (C) 2012-2013 Crocodile RCS Ltd
*
* This file is part of Kamailio, a free SIP server.
Expand All @@ -15,8 +13,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Exception: permission to copy, modify, propagate, and distribute a work
Expand Down
8 changes: 3 additions & 5 deletions src/modules/outbound/config.c
@@ -1,6 +1,4 @@
/*
* $Id$
*
* This file is part of Kamailio, a free SIP server.
*
* Kamailio is free software; you can redistribute it and/or modify
Expand All @@ -13,8 +11,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Exception: permission to copy, modify, propagate, and distribute a work
Expand All @@ -25,7 +23,7 @@
*/

/*!
* \file
* \file
* \brief Outbound :: Configuration
* \ingroup outbound
*/
Expand Down
8 changes: 3 additions & 5 deletions src/modules/outbound/config.h
@@ -1,6 +1,4 @@
/*
* $Id$
*
* This file is part of Kamailio, a free SIP server.
*
* Kamailio is free software; you can redistribute it and/or modify
Expand All @@ -13,8 +11,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Exception: permission to copy, modify, propagate, and distribute a work
Expand All @@ -25,7 +23,7 @@
*/

/*!
* \file
* \file
* \brief Outbound :: Configuration Framework support
* \ingroup outbound
*/
Expand Down
14 changes: 2 additions & 12 deletions src/modules/outbound/doc/outbound_admin.xml
Expand Up @@ -10,9 +10,9 @@
<!-- Module User's Guide -->

<chapter>

<title>&adminguide;</title>

<section>
<title>Overview</title>
<para>This module provides C-API functions to enable &kamailio; to be
Expand Down Expand Up @@ -511,15 +511,5 @@ modparam("outbound", "force_no_outbound_flag", 2)

</section>

<section>
<title>Functions</title>
<para><emphasis>None</emphasis></para>
</section>

<section>
<title>MI Commands</title>
<para><emphasis>None</emphasis></para>
</section>

</chapter>

17 changes: 7 additions & 10 deletions src/modules/outbound/ob_mod.c
@@ -1,6 +1,4 @@
/*
* $Id$
*
* Copyright (C) 2012-2013 Crocodile RCS Ltd
*
* This file is part of Kamailio, a free SIP server.
Expand Down Expand Up @@ -36,7 +34,6 @@
#include "../../core/mod_fix.h"
#include "../../core/sr_module.h"
#include "../../core/counters.h"
#include "../../lib/kmi/mi.h"
#include "../../core/parser/contact/parse_contact.h"
#include "../../core/parser/parse_rr.h"
#include "../../core/parser/parse_uri.h"
Expand All @@ -56,7 +53,7 @@ static unsigned int ob_force_flag = (unsigned int) -1;
static unsigned int ob_force_no_flag = (unsigned int) -1;
static str ob_key = {0, 0};

static cmd_export_t cmds[]=
static cmd_export_t cmds[]=
{
{ "bind_ob", (cmd_function) bind_ob,
1, 0, 0,
Expand All @@ -71,7 +68,7 @@ static param_export_t params[]=
{ 0, 0, 0 }
};

struct module_exports exports=
struct module_exports exports=
{
"outbound",
DEFAULT_DLFLAGS, /* dlopen flags */
Expand Down Expand Up @@ -145,7 +142,7 @@ static void destroy(void)
<protocol> specifies whether the addresses are IPv4 or IPv6 and the
transport.
Bits 0-6: transport (see sip_protos enum from ip_addr.h)
Bit 7: IPv6 if set, IPv4 if unset
Bit 7: IPv6 if set, IPv4 if unset
IP addresses will be 4 (for IPv6) or 16 (for IPv6) bytes.
Expand All @@ -172,7 +169,7 @@ int encode_flow_token(str *flow_token, struct receive_info rcv)
}

/* Encode protocol information */
unenc_flow_token[pos++] =
unenc_flow_token[pos++] =
(rcv.dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv.proto;

/* Encode destination address */
Expand Down Expand Up @@ -299,7 +296,7 @@ int decode_flow_token(struct sip_msg *msg, struct receive_info **rcv, str flow_t
static int use_outbound_register(struct sip_msg *msg)
{
contact_t *contact;

/* Check there is a single Via: */
if (!(parse_headers(msg, HDR_VIA2_F, 0) == -1 || msg->via2 == 0
|| msg->via2->error != PARSE_OK))
Expand All @@ -323,7 +320,7 @@ static int use_outbound_register(struct sip_msg *msg)
LM_ERR("empty Contact:\n");
return 0;
}

if (contact->reg_id)
{
LM_DBG("found REGISTER with ;reg-id parameter on"
Expand Down Expand Up @@ -439,7 +436,7 @@ static int use_outbound_non_reg(struct sip_msg *msg)
LM_ERR("empty Contact:\n");
return 0;
}

if (parse_uri(contact->uri.s, contact->uri.len, &puri)
< 0)
{
Expand Down

0 comments on commit ad2341a

Please sign in to comment.