Fix some compiler errors that popped up after the CCSS merge.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@256529 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
0eb1e5407a
commit
fc9cd201e4
|
@ -1920,7 +1920,7 @@ static int sip_cc_monitor_request_cc(struct ast_cc_monitor *monitor, int *availa
|
||||||
ast_get_ccnr_available_timer(monitor->interface->config_params);
|
ast_get_ccnr_available_timer(monitor->interface->config_params);
|
||||||
|
|
||||||
sip_pvt_lock(monitor_instance->subscription_pvt);
|
sip_pvt_lock(monitor_instance->subscription_pvt);
|
||||||
create_addr(monitor_instance->subscription_pvt, monitor_instance->peername, 0, 1);
|
create_addr(monitor_instance->subscription_pvt, monitor_instance->peername, 0, 1, NULL);
|
||||||
ast_sip_ouraddrfor(&monitor_instance->subscription_pvt->sa.sin_addr, &monitor_instance->subscription_pvt->ourip, monitor_instance->subscription_pvt);
|
ast_sip_ouraddrfor(&monitor_instance->subscription_pvt->sa.sin_addr, &monitor_instance->subscription_pvt->ourip, monitor_instance->subscription_pvt);
|
||||||
monitor_instance->subscription_pvt->subscribed = CALL_COMPLETION;
|
monitor_instance->subscription_pvt->subscribed = CALL_COMPLETION;
|
||||||
monitor_instance->subscription_pvt->expiry = when;
|
monitor_instance->subscription_pvt->expiry = when;
|
||||||
|
@ -10611,7 +10611,7 @@ static int transmit_publish(struct sip_epa_entry *epa_entry, enum sip_publish_ty
|
||||||
|
|
||||||
sip_pvt_lock(pvt);
|
sip_pvt_lock(pvt);
|
||||||
|
|
||||||
if (create_addr(pvt, epa_entry->destination, NULL, TRUE)) {
|
if (create_addr(pvt, epa_entry->destination, NULL, TRUE, NULL)) {
|
||||||
dialog_unlink_all(pvt, TRUE, TRUE);
|
dialog_unlink_all(pvt, TRUE, TRUE);
|
||||||
dialog_unref(pvt, "create_addr failed in transmit_publish. Unref dialog");
|
dialog_unref(pvt, "create_addr failed in transmit_publish. Unref dialog");
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,6 +31,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||||
#include "asterisk/srv.h"
|
#include "asterisk/srv.h"
|
||||||
#include "asterisk/pbx.h"
|
#include "asterisk/pbx.h"
|
||||||
#include "asterisk/app.h"
|
#include "asterisk/app.h"
|
||||||
|
#include "asterisk/datastore.h"
|
||||||
|
#include "asterisk/channel.h"
|
||||||
|
|
||||||
/*** DOCUMENTATION
|
/*** DOCUMENTATION
|
||||||
<function name="SRVQUERY" language="en_US">
|
<function name="SRVQUERY" language="en_US">
|
||||||
|
|
|
@ -37,6 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||||
#include "asterisk/module.h"
|
#include "asterisk/module.h"
|
||||||
#include "asterisk/test.h"
|
#include "asterisk/test.h"
|
||||||
#include "asterisk/pbx.h"
|
#include "asterisk/pbx.h"
|
||||||
|
#include "asterisk/channel.h"
|
||||||
|
|
||||||
AST_TEST_DEFINE(test_gosub)
|
AST_TEST_DEFINE(test_gosub)
|
||||||
{
|
{
|
||||||
|
|
Reference in New Issue