retronetworking
/
chan-capi
mirror of https://github.com/MelwareDE/chan-capi.git
13
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add device state for interfaces

This commit is contained in:
MelwareDE 2010-11-05 21:58:49 +00:00
parent e4de99914f
commit 4f4b5bb6b6
3 changed files with 81 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
chan_capi.c
View File

@ -4946,6 +4946,7 @@ static void capidev_handle_disconnect_b3_indication(_cmsg *CMSG, unsigned int PL
if (i->channeltype != CAPI_CHANNELTYPE_NULL) {
capi_controllers[i->controller]->nfreebchannels++;
pbx_capi_ifc_state_event(capi_controllers[i->controller], 1);
}
}
@ -4966,6 +4967,7 @@ static void capidev_handle_connect_b3_indication(_cmsg *CMSG, unsigned int PLCI,
if (i->channeltype != CAPI_CHANNELTYPE_NULL) {
capi_controllers[i->controller]->nfreebchannels--;
pbx_capi_ifc_state_event(capi_controllers[i->controller], -1);
}
return;
@ -5600,6 +5602,7 @@ static void capidev_handle_msg(_cmsg *CMSG)
i->NCCI = NCCI;
if (i->channeltype != CAPI_CHANNELTYPE_NULL) {
capi_controllers[i->controller]->nfreebchannels--;
pbx_capi_ifc_state_event(capi_controllers[i->controller], -1);
}
} else {
i->isdnstate &= ~(CAPI_ISDN_STATE_B3_UP | CAPI_ISDN_STATE_B3_PEND);
@ -7421,7 +7424,7 @@ static int pbx_capi_devicestate(void *data)
char *s;
char *target;
int res = AST_DEVICE_UNKNOWN;
struct capi_pvt *i;
struct capi_pvt *i = NULL;
if (!data) {
cc_verbose(3, 1, VERBOSE_PREFIX_2 "No data for "
@ -7432,16 +7435,44 @@ static int pbx_capi_devicestate(void *data)
s = ast_strdupa(data);
target = strsep(&s, "/");
cc_mutex_lock(&iflock);
for (i = capi_iflist; i; i = i->next) {
if (!(strcmp(target, i->vname)))
break;
if (target != NULL) {
cc_mutex_lock(&iflock);
for (i = capi_iflist; i; i = i->next) {
if (!(strcmp(target, i->vname)))
break;
}
cc_mutex_unlock(&iflock);
}
cc_mutex_unlock(&iflock);
if (!i) {
cc_log(LOG_WARNING, "Unknown target '%s' for devicestate.\n",
target);
const char* interfaceEvent = strsep(&s, "/");
if ((target != NULL) && (*target == 'I') &&
(interfaceEvent != NULL) && (strcmp(interfaceEvent, "congestion") == 0)) {
const struct cc_capi_controller *capiController;
capiController = pbx_capi_get_controller(atoi(&target[1]));
if (capiController != NULL) {
if (pbx_capi_check_controller_status(capiController->controller) < 0) {
res = AST_DEVICE_UNAVAILABLE;
} else {
if (capiController->nbchannels == capiController->nfreebchannels) {
res = AST_DEVICE_NOT_INUSE;
} else if ((capiController->nfreebchannels == 0) ||
(capiController->nfreebchannels < capiController->nfreebchannelsHardThr)) {
res = AST_DEVICE_BUSY;
} else {
res = AST_DEVICE_INUSE;
}
}
} else {
cc_log(LOG_WARNING, "Unknown controller '%s' for devicestate.\n",
target);
}
} else {
cc_log(LOG_WARNING, "Unknown target '%s' for devicestate.\n",
target);
}
} else {
switch (i->state) {
case 0:
@ -8774,16 +8805,23 @@ int pbx_capi_get_num_controllers(void)
static void pbx_capi_interface_status_changed(int controller, diva_status_interface_state_t newInterfaceState)
{
int currentInterfaceState;
int originalControllerStatus = (pbx_capi_check_controller_status(controller) != -1);
int newControllerStatus;
cc_mutex_lock(&iflock);
currentInterfaceState = capi_controllers[controller]->interfaceState;
capi_controllers[controller]->interfaceState = newInterfaceState;
cc_mutex_unlock(&iflock);
newControllerStatus = (pbx_capi_check_controller_status(controller) != -1);
cc_verbose(1, 0, VERBOSE_PREFIX_1 "CAPI%d: interface state changed %s -> %s\n",
controller,
diva_status_interface_state_name((diva_status_interface_state_t)currentInterfaceState),
diva_status_interface_state_name((diva_status_interface_state_t)newInterfaceState));
if (originalControllerStatus != newControllerStatus)
pbx_capi_ifc_state_event(capi_controllers[controller], 0);
}
static void pbx_capi_hw_status_changed(int controller, diva_status_hardware_state_t newHwState)
@ -8795,7 +8833,6 @@ static void pbx_capi_hw_status_changed(int controller, diva_status_hardware_stat
capi_controllers[controller]->hwState = newHwState;
cc_mutex_unlock(&iflock);
cc_verbose(1, 0, VERBOSE_PREFIX_1 "CAPI%d: hardware state changed %s -> %s\n",
controller,
diva_status_hw_state_name((diva_status_hardware_state_t)currentHwState),

35
chan_capi_devstate.c
View File

@ -45,7 +45,22 @@ static int capiChatProviderRegistered;
void pbx_capi_register_device_state_providers(void)
{
int i, capi_num_controllers;
capiChatProviderRegistered = (ast_devstate_prov_add("Capichat", pbx_capi_chat_room_state) == 0);
/*
Set initial device state for all supported interface
*/
for (i = 1, capi_num_controllers = pbx_capi_get_num_controllers();
i <= capi_num_controllers;
i++) {
const struct cc_capi_controller *capiController = pbx_capi_get_controller(i);
if (capiController != NULL) {
pbx_capi_ifc_state_event(capiController, 0);
}
}
}
void pbx_capi_unregister_device_state_providers(void)
@ -89,7 +104,8 @@ pbx_capi_chat_room_state(const char *data)
/*!
* \brief Conference room state change
*/
void pbx_capi_chat_room_state_event(const char* roomName, int inUse) {
void pbx_capi_chat_room_state_event(const char* roomName, int inUse)
{
if (capiChatProviderRegistered != 0) {
#ifdef CC_AST_HAS_VERSION_1_6
ast_devstate_changed((inUse != 0) ? AST_DEVICE_INUSE : AST_DEVICE_NOT_INUSE, "capichat:%s", roomName);
@ -99,3 +115,20 @@ void pbx_capi_chat_room_state_event(const char* roomName, int inUse) {
}
}
void pbx_capi_ifc_state_event(const struct cc_capi_controller* capiController, int channelsChanged)
{
if ((channelsChanged == 0) ||
(capiController->nbchannels == capiController->nfreebchannels) ||
(capiController->nfreebchannels == 0) ||
((capiController->nfreebchannels < capiController->nfreebchannelsHardThr) &&
(capiController->nfreebchannels - channelsChanged >= capiController->nfreebchannelsHardThr)) ||
((capiController->nfreebchannels >= capiController->nfreebchannelsHardThr) &&
(capiController->nfreebchannels - channelsChanged < capiController->nfreebchannelsHardThr))) {
#ifdef CC_AST_HAS_VERSION_1_6
ast_devstate_changed(AST_DEVICE_UNKNOWN, CC_MESSAGE_BIGNAME"/I%d/congestion", capiController->controller);
#else
ast_device_state_changed (CC_MESSAGE_BIGNAME"/I%d/congestion", capiController->controller);
#endif
}
}

1
chan_capi_devstate.h
View File

@ -4,6 +4,7 @@
void pbx_capi_register_device_state_providers(void);
void pbx_capi_unregister_device_state_providers(void);
void pbx_capi_chat_room_state_event(const char* roomName, int inUse);
void pbx_capi_ifc_state_event(const struct cc_capi_controller* capiController, int channelsChanged);
#endif