Skip to content
This repository was archived by the owner on Feb 27, 2020. It is now read-only.

[Reviewer: Seb] Allow non-default Sproutlets to specify a port and URI #1815

Open
richardwhiuk wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

[Reviewer: Seb] Allow non-default Sproutlets to specify a port and URI #1815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22acf2f
Separate out defaulting and validating options
richardwhiuk May 2, 2017
bdb2271
Determine address family in main
richardwhiuk May 2, 2017
aad19aa
Initialize PJSIP after sproutlets have been loaded
richardwhiuk May 2, 2017
00786a3
Split creating and starting the stack
richardwhiuk May 2, 2017
85a8a57
Allow all sproutlets to register ports and URIs
richardwhiuk May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions include/sproutlet_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,12 @@
{ \
TRC_INFO(""#NAME_LOWER" enabled on %d", opt.port_##NAME_LOWER); \
opt.enabled_##NAME_LOWER = true; \
opt.sproutlet_ports.insert(opt.port_##NAME_LOWER); \
} \
} \
else if (opt.port_##NAME_LOWER != 0) \
{ \
TRC_INFO(""#NAME_LOWER" enabled on %d", opt.port_##NAME_LOWER); \
opt.enabled_##NAME_LOWER = true; \
opt.sproutlet_ports.insert(opt.port_##NAME_LOWER); \
} \
\
if (!opt.set_prefix_##NAME_LOWER) \
Expand Down Expand Up @@ -178,10 +176,6 @@
TRC_ERROR(""#NAME_LOWER" enabled, but no "#NAME_LOWER" URI specified"); \
return 1; \
} \
else \
{ \
sproutlet_uris.push_back(opt.uri_##NAME_LOWER); \
} \
}

#endif
17 changes: 10 additions & 7 deletions include/stack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,23 +165,26 @@ extern pj_status_t init_stack(const std::string& sas_system_name,
int pcscf_untrusted_port,
int scscf_port,
bool sas_signaling_if,
std::set<int> sproutlet_ports,
int address_family,
const std::string& local_host,
const std::string& public_host,
const std::string& home_domain,
const std::string& additional_home_domains,
const std::string& sproutlet_uri,
const std::string& sprout_hostname,
const std::string& alias_hosts,
const std::string& scscf_uri,
SIPResolver* sipresolver,
int record_routing_model,
const int default_session_expires,
const int max_session_expires,
const int sip_tcp_connect_timeout,
const int sip_tcp_send_timeout,
QuiescingManager *quiescing_mgr,
const std::string& cdf_domain,
std::vector<std::string> sproutlet_uris);
const std::string& cdf_domain);

pj_status_t start_stack(std::set<int> sproutlet_ports,
const std::string& sprout_hostname,
const std::string& alias_hosts,
QuiescingManager *quiescing_mgr_arg,
std::vector<std::string> sproutlet_uris);

extern pj_status_t start_pjsip_thread();
extern pj_status_t stop_pjsip_thread();
extern void stop_stack();
Expand Down
Loading