diff --git a/libvoice/voice-types.h b/libvoice/voice-types.h index ae802410a508d180b3fa8f90a9d764a68093ab77..ccdac7833a6101c4629b8618f4f7691661988e6f 100644 --- a/libvoice/voice-types.h +++ b/libvoice/voice-types.h @@ -29,6 +29,7 @@ enum VOICE_CODEC { VOICE_CODEC_G726, VOICE_CODEC_G729, }; + enum voice_dtmf_mode { VOICE_DTMF_NONE, VOICE_DTMF_RFC_4733, @@ -51,6 +52,20 @@ struct config_update_struct { // add more if needed }; +// In UBUS request to voicemngr we need to define what this request is about +enum call_action { + CALL_DEFAULT0, // answer/release the call for PCM_0 + CALL_DEFAULT1, // answer/release the call for PCM_1 + CALL_DIGIT_PRESSED, // DTMF pressed + CALL_TOGGLE, // Switch in Call Waiting + CALL_CONFERENCE, // Join - start Call Conference + CALL_DECT_UNAVAILABLE, // No DECT handset available for call + CALL_REJECT, // indicate for call_reject event, upper 16 bits for pcm_id when using + CALL_MODE_SINGLE, // indicate the Single Call Mode has been set for DECT line + CALL_MODE_MULTIPLE, // indicate the Multiple Call Mode has been set for DECT line + CALL_LAST +}; + /* * UBUS related definitions */ diff --git a/line.h b/line.h index bc44dd772d11ec363effed8b7ef7905c112110ed..64a212d4d744c8d305d47477a5a01c7b00436484 100644 --- a/line.h +++ b/line.h @@ -17,20 +17,6 @@ enum line_action_t { ACTION_RINGING_STOP }; -// In UBUS request to voicemngr we need to define what this request is about -enum call_action { - CALL_DEFAULT0, // answer/release the call for PCM_0 - CALL_DEFAULT1, // answer/release the call for PCM_1 - CALL_DIGIT_PRESSED, // DTMF pressed - CALL_TOGGLE, // Switch in Call Waiting - CALL_CONFERENCE, // Join - start Call Conference - CALL_DECT_UNAVAILABLE, // No DECT handset available for call - CALL_REJECT, // indicate for call_reject event, upper 16 bits for pcm_id when using - CALL_MODE_SINGLE, // indicate the Single Call Mode has been set for DECT line - CALL_MODE_MULTIPLE, // indicate the Multiple Call Mode has been set for DECT line - CALL_LAST -}; - // Event sent with UBUS when something has happened with a phone line struct line_event_t { const char *name; // String communicated with Asterisk diff --git a/ubus.c b/ubus.c index e02388594a8ce81702a0ce37be9310cf2998daae..14128392f58fc8f1fe0062fbe6e047ea911474bc 100644 --- a/ubus.c +++ b/ubus.c @@ -737,8 +737,10 @@ static int ubus_request_status(struct ubus_context *uctx, struct ubus_object *ob for(line = 0; line < totEndpoints; line++) { void *tbl; tbl = blobmsg_open_table(&blob, NULL); + blobmsg_add_u32(&blob, "line", line); blobmsg_add_u32(&blob, "offhook", voice_line_is_offhook(line + unpopulatedDectEndpoints)); + blobmsg_close_table(&blob, tbl); }