Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

modules/ims_icscf: removes values.h dependency #489

Merged
merged 2 commits into from
Feb 3, 2016
Merged

modules/ims_icscf: removes values.h dependency #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
888fd8e
modules/ims_icscf: removes values.h dependency
mslehto Jan 15, 2016
5ac088f
modules/ims_icscf: use INT_MAX instead of MAXINT
mslehto Feb 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 1 addition & 6 deletions modules/ims_icscf/cxdx_lir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@
#include "mod.h"
#include "location.h"

#if defined (__OS_freebsd)
#include "sys/limits.h"
#define MAXINT INT_MAX
#endif

//we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable
int create_lia_return_code(int result) {
int rc;
Expand Down Expand Up @@ -183,7 +178,7 @@ void async_cdp_lir_callback(int is_timeout, void *param, AAAMessage *lia, long e

success:
if (server_name.len) {
list = new_scscf_entry(server_name, MAXINT, data->orig);
list = new_scscf_entry(server_name, INT_MAX, data->orig);
} else {
list = I_get_capab_ordered(server_name, m_capab, m_capab_cnt, o_capab, o_capab_cnt, p_server_names, p_server_names_cnt, data->orig);
}
Expand Down
9 changes: 2 additions & 7 deletions modules/ims_icscf/scscf_list.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@
#include "db.h"
#include "../../lib/ims/useful_defs.h"

#if defined (__OS_freebsd)
#include "sys/limits.h"
#define MAXINT INT_MAX
#endif

extern int scscf_entry_expiry; //time for scscf entries to remain the scscf_list

extern struct tm_binds tmb; //Structure with pointers to tm funcs
Expand Down Expand Up @@ -188,10 +183,10 @@ scscf_entry* I_get_capab_ordered(str scscf_name, int *m, int mcnt, int *o, int o
scscf_entry *list = 0;
int i, r;

if (scscf_name.len) list = I_add_to_scscf_list(list, scscf_name, MAXINT, orig);
if (scscf_name.len) list = I_add_to_scscf_list(list, scscf_name, INT_MAX, orig);

for (i = 0; i < pcnt; i++)
list = I_add_to_scscf_list(list, p[i], MAXINT - i, orig);
list = I_add_to_scscf_list(list, p[i], INT_MAX - i, orig);

for (i = 0; i < SCSCF_Capabilities_cnt; i++) {
r = I_get_capab_match(SCSCF_Capabilities + i, m, mcnt, o, ocnt);
Expand Down
11 changes: 1 addition & 10 deletions modules/ims_icscf/scscf_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,13 @@
#include "../../sr_module.h"
#include "../../modules/tm/tm_load.h"
#include "mod.h"
#ifndef __OS_darwin
#include <values.h>
#endif
#include <limits.h>
#include "../../mem/shm_mem.h"

#include "../../dset.h"

#include "../../timer.h"

#ifdef __OS_darwin
#ifndef MAXINT
#define MAXINT INT_MAX
#endif
#endif


/** S-CSCF list element */
typedef struct _scscf_entry {
str scscf_name; /**< SIP URI of the S-CSCF */
Expand Down