mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-25 07:08:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add accessors for the conference subject in the conference interface.

Browse source
This commit is contained in:
Ghislain MARY 2017-10-02 16:24:52 +02:00
parent ebbb838a5e
commit bb5d418afd
23 changed files with 136 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
coreapi/sal/sal.cpp
View file

@ -52,6 +52,7 @@ void Sal::process_request_event_cb(void *ud, const belle_sip_request_event_t *ev
belle_sip_header_t *evh;
const char *method=belle_sip_request_get_method(req);
belle_sip_header_contact_t* remote_contact = belle_sip_message_get_header_by_type(req, belle_sip_header_contact_t);
belle_sip_header_t *subjectHeader = belle_sip_message_get_header(BELLE_SIP_MESSAGE(req), "Subject");
from_header=belle_sip_message_get_header_by_type(BELLE_SIP_MESSAGE(req),belle_sip_header_from_t);
@ -161,6 +162,11 @@ void Sal::process_request_event_cb(void *ud, const belle_sip_request_event_t *ev
belle_sip_object_unref(address);
}
if (subjectHeader) {
const char *subject = belle_sip_header_get_unparsed_value(subjectHeader);
op->set_subject(subject);
}
if(!op->diversion_address){
diversion=belle_sip_message_get_header_by_type(BELLE_SIP_MESSAGE(req),belle_sip_header_diversion_t);
if (diversion) {

8
coreapi/sal/sal_op.cpp
View file

@ -65,6 +65,10 @@ SalOp::~SalOp() {
ms_free(this->to);
this->to=NULL;
}
if (this->subject) {
ms_free(this->subject);
this->subject = NULL;
}
if (this->route) {
ms_free(this->route);
this->route=NULL;
@ -198,6 +202,10 @@ void SalOp::set_realm(const char *realm) {
assign_string(&this->name,name##_string); \
if(name##_string) ms_free(name##_string);
void SalOp::set_subject (const char *subject) {
assign_string(&this->subject, subject);
}
void SalOp::set_from(const char *from){
SET_PARAM(from);
}

8
coreapi/sal/sal_op.h
View file

@ -41,8 +41,11 @@ public:
void set_user_pointer(void *up) {this->user_pointer=up;}
void *get_user_pointer() const {return this->user_pointer;}
void set_subject (const char *subject);
const char *get_subject () const { return this->subject; }
void set_from(const char *from);
void set_from_address(const SalAddress *from);
const char *get_from() const {return this->from;}
@ -197,6 +200,7 @@ protected:
char *route = NULL; /*or request-uri for REGISTER*/
MSList* route_addresses = NULL; /*list of SalAddress* */
SalAddress* contact_address = NULL;
char *subject = NULL;
char *from = NULL;
SalAddress* from_address = NULL;
char *to = NULL;

14
include/linphone/api/c-chat-room.h
View file

@ -282,6 +282,13 @@ LINPHONE_PUBLIC int linphone_chat_room_get_nb_participants (const LinphoneChatRo
*/
LINPHONE_PUBLIC bctbx_list_t * linphone_chat_room_get_participants (const LinphoneChatRoom *cr);
/**
* Get the subject of a chat room.
* @param[in] cr A LinphoneChatRoom object
* @return The subject of the chat room
*/
LINPHONE_PUBLIC const char * linphone_chat_room_get_subject (const LinphoneChatRoom *cr);
/**
* Remove a participant of a chat room.
* @param[in] cr A LinphoneChatRoom object
@ -296,6 +303,13 @@ LINPHONE_PUBLIC void linphone_chat_room_remove_participant (LinphoneChatRoom *cr
*/
LINPHONE_PUBLIC void linphone_chat_room_remove_participants (LinphoneChatRoom *cr, const bctbx_list_t *participants);
/**
* Set the subject of a chat room.
* @param[in] cr A LinphoneChatRoom object
* @param[in] subject The new subject to set for the chat room
*/
LINPHONE_PUBLIC void linphone_chat_room_set_subject (LinphoneChatRoom *cr, const char *subject);
/**
* Returns back pointer to #LinphoneCore object.
* @deprecated use linphone_chat_room_get_core()

8
src/c-wrapper/api/c-chat-room.cpp
View file

@ -245,6 +245,10 @@ bctbx_list_t *linphone_chat_room_get_participants (const LinphoneChatRoom *cr) {
return L_GET_RESOLVED_C_LIST_FROM_CPP_LIST(L_GET_CPP_PTR_FROM_C_OBJECT(cr)->getParticipants());
}
const char * linphone_chat_room_get_subject (const LinphoneChatRoom *cr) {
return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(cr)->getSubject());
}
void linphone_chat_room_remove_participant (LinphoneChatRoom *cr, LinphoneParticipant *participant) {
L_GET_CPP_PTR_FROM_C_OBJECT(cr)->removeParticipant(L_GET_CPP_PTR_FROM_C_OBJECT(participant));
}
@ -253,6 +257,10 @@ void linphone_chat_room_remove_participants (LinphoneChatRoom *cr, const bctbx_l
L_GET_CPP_PTR_FROM_C_OBJECT(cr)->removeParticipants(L_GET_RESOLVED_CPP_LIST_FROM_C_LIST(participants, Participant));
}
void linphone_chat_room_set_subject (LinphoneChatRoom *cr, const char *subject) {
L_GET_CPP_PTR_FROM_C_OBJECT(cr)->setSubject(L_C_TO_STRING(subject));
}
// =============================================================================
// Reference and user data handling functions.
// =============================================================================

2
src/chat/basic-chat-room-p.h
View file

@ -35,6 +35,8 @@ public:
virtual ~BasicChatRoomPrivate () = default;
private:
std::string subject;
L_DECLARE_PUBLIC(BasicChatRoom);
};

10
src/chat/basic-chat-room.cpp
View file

@ -64,6 +64,11 @@ list<shared_ptr<Participant>> BasicChatRoom::getParticipants () const {
return l;
}
const string &BasicChatRoom::getSubject () const {
L_D();
return d->subject;
}
void BasicChatRoom::removeParticipant (const shared_ptr<const Participant> &participant) {
lError() << "removeParticipant() is not allowed on a BasicChatRoom";
}
@ -72,4 +77,9 @@ void BasicChatRoom::removeParticipants (const list<shared_ptr<Participant>> &par
lError() << "removeParticipants() is not allowed on a BasicChatRoom";
}
void BasicChatRoom::setSubject (const string &subject) {
L_D();
d->subject = subject;
}
LINPHONE_END_NAMESPACE

2
src/chat/basic-chat-room.h
View file

@ -39,8 +39,10 @@ public:
const Address *getConferenceAddress () const override;
int getNbParticipants () const override;
std::list<std::shared_ptr<Participant>> getParticipants () const override;
const std::string &getSubject () const override;
void removeParticipant (const std::shared_ptr<const Participant> &participant) override;
void removeParticipants (const std::list<std::shared_ptr<Participant>> &participants) override;
void setSubject (const std::string &subject) override;
private:
L_DECLARE_PRIVATE(BasicChatRoom);

4
src/chat/client-group-chat-room-p.h
View file

@ -31,12 +31,10 @@ LINPHONE_BEGIN_NAMESPACE
class ClientGroupChatRoomPrivate : public ChatRoomPrivate {
public:
ClientGroupChatRoomPrivate (LinphoneCore *core, const std::string &subject);
ClientGroupChatRoomPrivate (LinphoneCore *core);
virtual ~ClientGroupChatRoomPrivate () = default;
private:
std::string subject;
L_DECLARE_PUBLIC(ClientGroupChatRoom);
};

27
src/chat/client-group-chat-room.cpp
View file

@ -31,15 +31,16 @@ using namespace std;
LINPHONE_BEGIN_NAMESPACE
ClientGroupChatRoomPrivate::ClientGroupChatRoomPrivate (LinphoneCore *core, const string &subject)
: ChatRoomPrivate(core), subject(subject) {}
ClientGroupChatRoomPrivate::ClientGroupChatRoomPrivate (LinphoneCore *core)
: ChatRoomPrivate(core) {}
// =============================================================================
ClientGroupChatRoom::ClientGroupChatRoom (LinphoneCore *core, const Address &me, const string &subject)
: ChatRoom(*new ClientGroupChatRoomPrivate(core, subject)), RemoteConference(core, me, nullptr) {
: ChatRoom(*new ClientGroupChatRoomPrivate(core)), RemoteConference(core, me, nullptr) {
string factoryUri = linphone_core_get_conference_factory_uri(core);
focus = make_shared<Participant>(factoryUri);
this->subject = subject;
}
// -----------------------------------------------------------------------------
@ -73,7 +74,7 @@ void ClientGroupChatRoom::addParticipants (const list<Address> &addresses, const
Address addr = me->getAddress();
addr.setParam("text", "");
session->getPrivate()->getOp()->set_contact_address(addr.getPrivate()->getInternalAddress());
session->startInvite(nullptr, d->subject);
session->startInvite(nullptr, subject);
d->setState(ChatRoom::State::CreationPending);
}
// TODO
@ -95,6 +96,10 @@ list<shared_ptr<Participant>> ClientGroupChatRoom::getParticipants () const {
return RemoteConference::getParticipants();
}
const string &ClientGroupChatRoom::getSubject () const {
return RemoteConference::getSubject();
}
void ClientGroupChatRoom::removeParticipant (const shared_ptr<const Participant> &participant) {
// TODO
}
@ -103,6 +108,20 @@ void ClientGroupChatRoom::removeParticipants (const list<shared_ptr<Participant>
// TODO
}
void ClientGroupChatRoom::setSubject (const string &subject) {
L_D();
if (d->state != ChatRoom::State::Created) {
lError() << "Cannot change the ClientGroupChatRoom subject in a state other than Created";
return;
}
if (!me->isAdmin()) {
lError() << "Cannot change the ClientGroupChatRoom subject because I am not admin";
return;
}
shared_ptr<CallSession> session = focus->getPrivate()->getSession();
session->update(nullptr, subject);
}
// -----------------------------------------------------------------------------
void ClientGroupChatRoom::onConferenceCreated (const Address &addr) {

2
src/chat/client-group-chat-room.h
View file

@ -47,8 +47,10 @@ public:
const Address *getConferenceAddress () const override;
int getNbParticipants () const override;
std::list<std::shared_ptr<Participant>> getParticipants () const override;
const std::string &getSubject () const override;
void removeParticipant (const std::shared_ptr<const Participant> &participant) override;
void removeParticipants (const std::list<std::shared_ptr<Participant>> &participants) override;
void setSubject (const std::string &subject) override;
private:
/* ConferenceListener */

2
src/chat/real-time-text-chat-room-p.h
View file

@ -46,6 +46,8 @@ public:
std::shared_ptr<ChatMessage> pendingMessage = nullptr;
private:
std::string subject;
L_DECLARE_PUBLIC(RealTimeTextChatRoom);
};

10
src/chat/real-time-text-chat-room.cpp
View file

@ -160,6 +160,11 @@ list<shared_ptr<Participant>> RealTimeTextChatRoom::getParticipants () const {
return l;
}
const string &RealTimeTextChatRoom::getSubject () const {
L_D();
return d->subject;
}
void RealTimeTextChatRoom::removeParticipant (const shared_ptr<const Participant> &participant) {
lError() << "removeParticipant() is not allowed on a RealTimeTextChatRoom";
}
@ -168,4 +173,9 @@ void RealTimeTextChatRoom::removeParticipants (const list<shared_ptr<Participant
lError() << "removeParticipants() is not allowed on a RealTimeTextChatRoom";
}
void RealTimeTextChatRoom::setSubject (const string &subject) {
L_D();
d->subject = subject;
}
LINPHONE_END_NAMESPACE

2
src/chat/real-time-text-chat-room.h
View file

@ -49,8 +49,10 @@ public:
const Address *getConferenceAddress () const override;
int getNbParticipants () const override;
std::list<std::shared_ptr<Participant>> getParticipants () const override;
const std::string &getSubject () const override;
void removeParticipant (const std::shared_ptr<const Participant> &participant) override;
void removeParticipants (const std::list<std::shared_ptr<Participant>> &participants) override;
void setSubject (const std::string &subject) override;
private:
L_DECLARE_PRIVATE(RealTimeTextChatRoom);

2
src/conference/conference-interface.h
View file

@ -40,8 +40,10 @@ public:
virtual const Address *getConferenceAddress () const = 0;
virtual int getNbParticipants () const = 0;
virtual std::list<std::shared_ptr<Participant>> getParticipants () const = 0;
virtual const std::string &getSubject () const = 0;
virtual void removeParticipant (const std::shared_ptr<const Participant> &participant) = 0;
virtual void removeParticipants (const std::list<std::shared_ptr<Participant>> &participants) = 0;
virtual void setSubject (const std::string &subject) = 0;
};
LINPHONE_END_NAMESPACE

8
src/conference/conference.cpp
View file

@ -66,6 +66,10 @@ list<shared_ptr<Participant>> Conference::getParticipants () const {
return participants;
}
const string &Conference::getSubject () const {
return subject;
}
void Conference::removeParticipant (const shared_ptr<const Participant> &participant) {
lError() << "Conference class does not handle removeParticipant() generically";
}
@ -75,6 +79,10 @@ void Conference::removeParticipants (const list<shared_ptr<Participant>> &partic
removeParticipant(p);
}
void Conference::setSubject (const string &subject) {
this->subject = subject;
}
// -----------------------------------------------------------------------------
void Conference::onAckBeingSent (const CallSession &session, LinphoneHeaders *headers) {

3
src/conference/conference.h
View file

@ -53,8 +53,10 @@ public:
const Address *getConferenceAddress () const override;
int getNbParticipants () const override;
std::list<std::shared_ptr<Participant>> getParticipants () const override;
const std::string &getSubject () const override;
void removeParticipant (const std::shared_ptr<const Participant> &participant) override;
void removeParticipants (const std::list<std::shared_ptr<Participant>> &participants) override;
void setSubject (const std::string &subject) override;
private:
/* CallSessionListener */
@ -87,6 +89,7 @@ protected:
std::shared_ptr<Participant> me;
std::list<std::shared_ptr<Participant>> participants;
Address conferenceAddress;
std::string subject;
private:
L_DISABLE_COPY(Conference);

3
src/conference/session/call-session-p.h
View file

@ -64,7 +64,7 @@ protected:
virtual void setReleased ();
virtual void setTerminated ();
virtual LinphoneStatus startAcceptUpdate (LinphoneCallState nextState, const std::string &stateInfo);
virtual LinphoneStatus startUpdate ();
virtual LinphoneStatus startUpdate (const std::string &subject);
virtual void terminate ();
virtual void updateCurrentParams () const;
@ -85,6 +85,7 @@ protected:
mutable CallSessionParams *currentParams = nullptr;
CallSessionParams *remoteParams = nullptr;
std::string subject;
LinphoneCallDir direction = LinphoneCallOutgoing;
LinphoneCallState state = LinphoneCallIdle;
LinphoneCallState prevState = LinphoneCallIdle;

29
src/conference/session/call-session.cpp
View file

@ -564,23 +564,25 @@ LinphoneStatus CallSessionPrivate::startAcceptUpdate (LinphoneCallState nextStat
return 0;
}
LinphoneStatus CallSessionPrivate::startUpdate () {
LinphoneStatus CallSessionPrivate::startUpdate (const string &subject) {
L_Q();
string subject;
if (q->getParams()->getPrivate()->getInConference())
subject = "Conference";
else if (q->getParams()->getPrivate()->getInternalCallUpdate())
subject = "ICE processing concluded";
else if (q->getParams()->getPrivate()->getNoUserConsent())
subject = "Refreshing";
else
subject = "Media change";
string newSubject(subject);
if (newSubject.empty()) {
if (q->getParams()->getPrivate()->getInConference())
newSubject = "Conference";
else if (q->getParams()->getPrivate()->getInternalCallUpdate())
newSubject = "ICE processing concluded";
else if (q->getParams()->getPrivate()->getNoUserConsent())
newSubject = "Refreshing";
else
newSubject = "Media change";
}
if (destProxy && destProxy->op) {
/* Give a chance to update the contact address if connectivity has changed */
op->set_contact_address(destProxy->op->get_contact_address());
} else
op->set_contact_address(nullptr);
return op->update(subject.c_str(), q->getParams()->getPrivate()->getNoUserConsent());
return op->update(newSubject.c_str(), q->getParams()->getPrivate()->getNoUserConsent());
}
void CallSessionPrivate::terminate () {
@ -827,6 +829,7 @@ void CallSession::startIncomingNotification () {
int CallSession::startInvite (const Address *destination, const string &subject) {
L_D();
d->subject = subject;
/* Try to be best-effort in giving real local or routable contact address */
d->setContactOp();
string destinationStr;
@ -889,7 +892,7 @@ LinphoneStatus CallSession::terminate (const LinphoneErrorInfo *ei) {
return 0;
}
LinphoneStatus CallSession::update (const CallSessionParams *csp) {
LinphoneStatus CallSession::update (const CallSessionParams *csp, const string &subject) {
L_D();
LinphoneCallState nextState;
LinphoneCallState initialState = d->state;
@ -897,7 +900,7 @@ LinphoneStatus CallSession::update (const CallSessionParams *csp) {
return -1;
if (d->currentParams == csp)
lWarning() << "CallSession::update() is given the current params, this is probably not what you intend to do!";
LinphoneStatus result = d->startUpdate();
LinphoneStatus result = d->startUpdate(subject);
if (result && (d->state != initialState)) {
/* Restore initial state */
d->setState(initialState, "Restore initial state");

4
src/conference/session/call-session.h
View file

@ -49,9 +49,9 @@ public:
virtual bool initiateOutgoing ();
virtual void iterate (time_t currentRealTime, bool oneSecondElapsed);
virtual void startIncomingNotification ();
virtual int startInvite (const Address *destination, const std::string &subject);
virtual int startInvite (const Address *destination, const std::string &subject = "");
LinphoneStatus terminate (const LinphoneErrorInfo *ei = nullptr);
LinphoneStatus update (const CallSessionParams *csp);
LinphoneStatus update (const CallSessionParams *csp, const std::string &subject = "");
CallSessionParams *getCurrentParams () const;
LinphoneCallDir getDirection () const;

2
src/conference/session/media-session-p.h
View file

@ -232,7 +232,7 @@ private:
LinphoneStatus pause ();
void setTerminated () override;
LinphoneStatus startAcceptUpdate (LinphoneCallState nextState, const std::string &stateInfo) override;
LinphoneStatus startUpdate () override;
LinphoneStatus startUpdate (const std::string &subject = "") override;
void terminate () override;
void updateCurrentParams () const override;

8
src/conference/session/media-session.cpp
View file

@ -3706,7 +3706,7 @@ LinphoneStatus MediaSessionPrivate::startAcceptUpdate (LinphoneCallState nextSta
return 0;
}
LinphoneStatus MediaSessionPrivate::startUpdate () {
LinphoneStatus MediaSessionPrivate::startUpdate (const string &subject) {
fillMulticastMediaAddresses();
if (!params->getPrivate()->getNoUserConsent())
makeLocalMediaDescription();
@ -3714,7 +3714,7 @@ LinphoneStatus MediaSessionPrivate::startUpdate () {
op->set_local_media_description(localDesc);
else
op->set_local_media_description(nullptr);
LinphoneStatus result = CallSessionPrivate::startUpdate();
LinphoneStatus result = CallSessionPrivate::startUpdate(subject);
if (core->sip_conf.sdp_200_ack) {
/* We are NOT offering, set local media description after sending the call so that we are ready to
* process the remote offer when it will arrive. */
@ -4297,7 +4297,7 @@ void MediaSession::stopRecording () {
d->recordActive = false;
}
LinphoneStatus MediaSession::update (const MediaSessionParams *msp) {
LinphoneStatus MediaSession::update (const MediaSessionParams *msp, const string &subject) {
L_D();
LinphoneCallState nextState;
LinphoneCallState initialState = d->state;
@ -4316,7 +4316,7 @@ LinphoneStatus MediaSession::update (const MediaSessionParams *msp) {
lInfo() << "Defer CallSession update to gather ICE candidates";
return 0;
}
LinphoneStatus result = d->startUpdate();
LinphoneStatus result = d->startUpdate(subject);
if (result && (d->state != initialState)) {
/* Restore initial state */
d->setState(initialState, "Restore initial state");

4
src/conference/session/media-session.h
View file

@ -48,10 +48,10 @@ public:
LinphoneStatus resume ();
void sendVfuRequest ();
void startIncomingNotification () override;
int startInvite (const Address *destination, const std::string &subject) override;
int startInvite (const Address *destination, const std::string &subject = "") override;
void startRecording ();
void stopRecording ();
LinphoneStatus update (const MediaSessionParams *msp);
LinphoneStatus update (const MediaSessionParams *msp, const std::string &subject = "");
void resetFirstVideoFrameDecoded ();
LinphoneStatus takePreviewSnapshot (const std::string& file);