if (cr->op)
sal_op_release(cr->op);
}
-
-void linphone_chat_room_send_message(LinphoneChatRoom *cr, const char *msg){
+
+
+static void _linphone_chat_room_send_message(LinphoneChatRoom *cr, LinphoneChatMessage* msg){
const char *route=NULL;
const char *identity=linphone_core_find_best_identity(cr->lc,cr->peer_url,&route);
SalOp *op=NULL;
call->state==LinphoneCallPausedByRemote){
ms_message("send SIP message through the existing call.");
op = call->op;
+ call->pending_message=msg;
}
}
if (op==NULL){
cr->op=NULL;
}
cr->op=op;
+ sal_op_set_user_pointer(op, msg); /*if out of call, directly store msg*/
}
- sal_text_send(op,identity,cr->peer,msg);
+ sal_text_send(op,identity,cr->peer,msg->message);
}
+void linphone_chat_room_send_message(LinphoneChatRoom *cr, const char *msg) {
+ _linphone_chat_room_send_message(cr,linphone_chat_room_create_message(cr,msg));
+}
bool_t linphone_chat_room_matches(LinphoneChatRoom *cr, const LinphoneAddress *from){
if (linphone_address_get_username(cr->peer_url) && linphone_address_get_username(from) &&
strcmp(linphone_address_get_username(cr->peer_url),linphone_address_get_username(from))==0) return TRUE;
const LinphoneAddress* linphone_chat_room_get_peer_address(LinphoneChatRoom *cr) {
return cr->peer_url;
}
+
+LinphoneChatMessage* linphone_chat_room_create_message(const LinphoneChatRoom *cr,const char* message) {
+ LinphoneChatMessage* msg = ms_new0(LinphoneChatMessage,1);
+ msg->chat_room=(LinphoneChatRoom*)cr;
+ msg->message=ms_strdup(message);
+ return msg;
+}
+void linphone_chat_message_destroy(LinphoneChatMessage* msg) {
+ if (msg->message) ms_free((void*)msg->message);
+ ms_free((void*)msg);
+}
+void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage* msg,LinphoneChatMessageStateChangeCb status_cb,void* ud) {
+ msg->cb=status_cb;
+ msg->cb_ud=ud;
+ _linphone_chat_room_send_message(cr, msg);
+}
+
+const char* linphone_chat_message_state_to_string(const LinphoneChatMessageState state) {
+ switch (state) {
+ case LinphoneChatMessageStateIdle:return "LinphoneChatMessageStateIdle";
+ case LinphoneChatMessageStateInProgress:return "LinphoneChatMessageStateInProgress";
+ case LinphoneChatMessageStateDelivered:return "LinphoneChatMessageStateDelivered";
+ case LinphoneChatMessageStateNotDelivered:return "LinphoneChatMessageStateNotDelivered";
+ default: return "Unknown state";
+ }
+
+}
+/**
+ * user pointer set function
+ */
+void linphone_chat_message_set_user_data(LinphoneChatMessage* message,void* ud) {
+ message->message_userdata=ud;
+}
+/**
+ * user pointer get function
+ */
+void* linphone_chat_message_get_user_data(const LinphoneChatMessage* message) {
+ return message->message_userdata;
+}
\ No newline at end of file
}
}
+bool_t linphone_call_is_in_conference(const LinphoneCall *call) {
+ return call->params.in_conference;
+}
void linphone_call_set_user_pointer(LinphoneCall *call, void *user_pointer);
void linphone_call_set_next_video_frame_decoded_callback(LinphoneCall *call, LinphoneCallCbFunc cb, void* user_data);
LinphoneCallState linphone_call_get_transfer_state(LinphoneCall *call);
-
+/**
+ * Return TRUE if this call is currently part of a conference
+ *@param call #LinphoneCall
+ *@return TRUE if part of a conference.
+ *
+ @ingroup call_control
+ */
+bool_t linphone_call_is_in_conference(const LinphoneCall *call);
/**
* Enables or disable echo cancellation for this call
* @param call
* @addtogroup chatroom
* @{
*/
+
+/**
+ * A chat room message to old content to be sent.
+ * <br> Can be created by linphone_chat_room_create_message().
+ */
+typedef struct _LinphoneChatMessage LinphoneChatMessage;
+
/**
* A chat room is the place where text messages are exchanged.
* <br> Can be created by linphone_core_create_chat_room().
*/
typedef struct _LinphoneChatRoom LinphoneChatRoom;
+
/**
* Create a new chat room for messaging from a sip uri like sip:joe@sip.linphone.org
* @param lc #LinphoneCore object
*/
void linphone_chat_room_destroy(LinphoneChatRoom *cr);
+/**
+ * create a message attached to a dedicated chat room;
+ */
+LinphoneChatMessage* linphone_chat_room_create_message(const LinphoneChatRoom *cr,const char* message);
+
+
/**
* get peer address \link linphone_core_create_chat_room() associated to \endlink this #LinphoneChatRoom
* @param msg message to be sent
*/
void linphone_chat_room_send_message(LinphoneChatRoom *cr, const char *msg);
+/**
+ *LinphoneChatMessageStatus used to notify if message has been succesfully delivered or not
+ */
+typedef enum _LinphoneChatMessageStates {
+ LinphoneChatMessageStateIdle, /** initial state*/
+ LinphoneChatMessageStateInProgress, /*delivery in progress**/
+ LinphoneChatMessageStateDelivered, /** message succesffully delivered an acknoleged by remote end point*/
+ LinphoneChatMessageStateNotDelivered /** message was not delivered*/
+}LinphoneChatMessageState;
+
+/**
+ * to string function
+ */
+const char* linphone_chat_message_state_to_string(const LinphoneChatMessageState state);
+/**
+ * user pointer set function
+ */
+void linphone_chat_message_set_user_data(LinphoneChatMessage* message,void*);
+/**
+ * user pointer get function
+ */
+void* linphone_chat_message_get_user_data(const LinphoneChatMessage* message);
+
+/**
+ * Call back used to notify message delivery status
+ *@param msg #LinphoneChatMessage object
+ *@param status #LinphoneChatMessageStatus
+ *@param ud us user data
+ */
+typedef void (*LinphoneChatMessageStateChangeCb)(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud);
+/**
+ * send a message to peer member of this chat room.
+ * @param cr #LinphoneChatRoom object
+ * @param msg #LinphoneChatMessage message to be sent
+ * @param status_cb #LinphoneChatMessageStatus status call back invoked when to message is delivered or not. May be NULL
+ * @param ud user data for the status cb.
+ */
+void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage* msg,LinphoneChatMessageStateChangeCb status_cb,void* ud);
void linphone_chat_room_set_user_data(LinphoneChatRoom *cr, void * ud);
void * linphone_chat_room_get_user_data(LinphoneChatRoom *cr);
static const int linphone_call_magic=0x3343;
+struct _LinphoneChatMessage {
+ const char* message;
+ LinphoneChatRoom* chat_room;
+ LinphoneChatMessageStateChangeCb cb;
+ void* cb_ud;
+ void* message_userdata;
+};
+
struct _LinphoneCall
{
int magic; /*used to distinguish from proxy config*/
CallCallbackObj nextVideoFrameDecoded;
LinphoneCallStats stats[2];
IceSession *ice_session;
+ LinphoneChatMessage* pending_message;
};
static const int linphone_proxy_config_magic=0x7979;
+/*chat*/
+void linphone_chat_message_destroy(LinphoneChatMessage* msg);
+/**/
+
struct _LinphoneProxyConfig
{
int magic;
void * user_data;
};
+
+
struct _LinphoneFriend{
LinphoneAddress *uri;
SalOp *insub;
static void other_request_reply(Sal *sal,eXosip_event_t *ev){
SalOp *op=find_op(sal,ev);
-
+ LinphoneChatMessage* chat_msg;
+ ms_message("Processing reponse status [%i] for method [%s]",ev->response->status_code,osip_message_get_method(ev->request));
if (op==NULL){
ms_warning("other_request_reply(): Receiving response to unknown request.");
return;
update_contact_from_response(op,ev->response);
if (ev->request && strcmp(osip_message_get_method(ev->request),"OPTIONS")==0)
sal->callbacks.ping_reply(op);
+ else if (ev->request && strcmp(osip_message_get_method(ev->request),"MESSAGE")==0) {
+ /*out of call message acknolegment*/
+ chat_msg=(LinphoneChatMessage* )op->base.user_pointer;
+ if (chat_msg->cb) {
+ chat_msg->cb(chat_msg
+ ,(ev->response->status_code==200?LinphoneChatMessageStateDelivered:LinphoneChatMessageStateNotDelivered)
+ ,chat_msg->cb_ud);
+ }
+ linphone_chat_message_destroy(chat_msg);
+ }
}
}
projects / linphone / commitdiff