Commit 6beb9625 authored by Ghislain MARY's avatar Ghislain MARY

Move the new sal code in the src folder, respect the file naming conventions...

Move the new sal code in the src folder, respect the file naming conventions and add missing license headers.
parent 9b6d1158
......@@ -44,7 +44,6 @@ list(APPEND LINPHONE_PRIVATE_HEADER_FILES
offeranswer.h
private.h
quality_reporting.h
sal/sal.h
sqlite3_bctbx_vfs.h
vcard_private.h
xml2lpc.h
......@@ -99,7 +98,6 @@ set(LINPHONE_SOURCE_FILES_C
quality_reporting.c
remote_provisioning.c
ringtoneplayer.c
sal/sal.c
siplogin.c
sipsetup.c
sqlite3_bctbx_vfs.c
......@@ -111,13 +109,6 @@ set(LINPHONE_SOURCE_FILES_C
)
set(LINPHONE_SOURCE_FILES_CXX
conference.cc
sal/call_op.cpp
sal/event_op.cpp
sal/message_op.cpp
sal/presence_op.cpp
sal/register_op.cpp
sal/sal.cpp
sal/sal_op.cpp
tester_utils.cpp
)
set(LINPHONE_INCLUDE_DIRS ${LINPHONE_INCLUDE_DIRS})
......
......@@ -24,7 +24,7 @@
#include "linphone/core.h"
#include "linphone/lpconfig.h"
#include "sal/sal.hpp"
#include "sal/sal.h"
#include "c-wrapper/c-wrapper.h"
......
......@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef SAL_IMPL_H_
#define SAL_IMPL_H_
#include "sal/sal.h"
#include "c-wrapper/internal/c-sal.h"
#include "belle-sip/belle-sip.h"
#include "belle-sip/belle-sdp.h"
......
......@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "sal_impl.h"
#include "sal/sal.hpp"
#include "sal/sal.h"
using namespace LinphonePrivate;
......
......@@ -18,9 +18,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "sal/sal.h"
#include "sal/call_op.h"
#include "sal/message_op.h"
#include "c-wrapper/internal/c-sal.h"
#include "sal/call-op.h"
#include "sal/message-op.h"
#include "linphone/core.h"
#include "private.h"
......
......@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "linphone/event.h"
#include "linphone/lpconfig.h"
#include "sal/event_op.h"
#include "sal/event-op.h"
#include "c-wrapper/c-wrapper.h"
......
......@@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "c-wrapper/internal/c-sal.h"
#include "sal/sal.h"
#include "sal/sal.hpp"
#include "offeranswer.h"
#include "private.h"
......
......@@ -31,12 +31,12 @@
#include "linphone/tunnel.h"
#include "linphone/core_utils.h"
#include "linphone/conference.h"
#include "sal/sal.h"
#include "sal/call_op.h"
#include "sal/event_op.h"
#include "sal/message_op.h"
#include "sal/presence_op.h"
#include "sal/register_op.h"
#include "c-wrapper/internal/c-sal.h"
#include "sal/call-op.h"
#include "sal/event-op.h"
#include "sal/message-op.h"
#include "sal/presence-op.h"
#include "sal/register-op.h"
#include "linphone/sipsetup.h"
#include "quality_reporting.h"
#include "linphone/ringtoneplayer.h"
......
......@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "linphone/core.h"
#include "private.h"
#include "c-wrapper/internal/c-sal.h"
#include "sal/sal.h"
#include "sal/sal.hpp"
#include "ortp/rtpsession.h"
#include <math.h>
......
......@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define quality_reporting_h
#include "linphone/core.h"
#include "sal/sal.h"
#include "c-wrapper/internal/c-sal.h"
#ifdef __cplusplus
extern "C"{
......
......@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "account_creator_private.h"
#include "linphone/core.h"
#include "linphone/tunnel.h"
#include "sal/sal.h"
#include "c-wrapper/internal/c-sal.h"
#include <sqlite3.h>
#include "quality_reporting.h"
#include "vcard_private.h"
......
......@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "linphone/wrapper_utils.h"
#include "c-wrapper/c-wrapper.h"
#include "sal/sal.h"
#include "c-wrapper/internal/c-sal.h"
#include "vcard_private.h"
#define VCARD_MD5_HASH_SIZE 16
......
......@@ -25,6 +25,7 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
address/address.h
c-wrapper/c-wrapper.h
c-wrapper/internal/c-tools.h
c-wrapper/internal/c-sal.h
call/call-listener.h
call/call-p.h
call/call.h
......@@ -96,6 +97,7 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
object/object.h
object/property-container.h
object/singleton.h
sal/sal.h
utils/payload-type-handler.h
variant/variant.h
xml/conference-info.h
......@@ -116,6 +118,7 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
c-wrapper/api/c-chat-room-cbs.cpp
c-wrapper/api/c-event-log.cpp
c-wrapper/api/c-participant.cpp
c-wrapper/internal/c-sal.cpp
call/call.cpp
chat/basic-chat-room.cpp
chat/chat-message.cpp
......@@ -162,6 +165,13 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
object/clonable-object.cpp
object/object.cpp
object/property-container.cpp
sal/call-op.cpp
sal/event-op.cpp
sal/message-op.cpp
sal/op.cpp
sal/presence-op.cpp
sal/register-op.cpp
sal/sal.cpp
utils/general.cpp
utils/payload-type-handler.cpp
utils/utils.cpp
......
......@@ -23,7 +23,7 @@ This file contains SAL API functions that do not depend on the underlying implem
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "sal/sal.h"
#include "c-wrapper/internal/c-sal.h"
#include <ctype.h>
......
......@@ -27,7 +27,7 @@
#include "content/content.h"
#include "chat-message-p.h"
#include "chat-room.h"
#include "sal/message_op.h"
#include "sal/message-op.h"
#include "logger/logger.h"
// =============================================================================
......
......@@ -22,8 +22,8 @@
#include "object/clonable-object.h"
#include "linphone/types.h"
#include "c-wrapper/internal/c-sal.h"
#include "sal/sal.h"
#include "sal/sal.hpp"
// =============================================================================
......
......@@ -22,7 +22,7 @@
#include "object/object-p.h"
#include "call-session.h"
#include "sal/call_op.h"
#include "sal/call-op.h"
// =============================================================================
......
......@@ -24,7 +24,7 @@
#include "conference/conference.h"
#include "conference/params/call-session-params.h"
#include "conference/session/call-session-listener.h"
#include "sal/call_op.h"
#include "sal/call-op.h"
// =============================================================================
......
#include "call_op.h"
/*
* call-op.cpp
* Copyright (C) 2017 Belledonne Communications SARL
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "bellesip_sal/sal_impl.h"
#include "offeranswer.h"
#include "sal/call-op.h"
#include <bctoolbox/defs.h>
#include <belle-sip/provider.h>
......
/*
sal_op.h
Copyright (C) 2017 Belledonne Communications <info@belledonne-communications.com>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
* call-op.h
* Copyright (C) 2017 Belledonne Communications SARL
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _SAL_CALL_OP_H_
#define _SAL_CALL_OP_H_
#include "sal_op.h"
#include "message_op_interface.h"
#include "sal/op.h"
#include "sal/message-op-interface.h"
LINPHONE_BEGIN_NAMESPACE
......@@ -29,15 +28,15 @@ class SalCallOp: public SalOp, public SalMessageOpInterface {
public:
SalCallOp(Sal *sal): SalOp(sal) {}
~SalCallOp() override;
int set_local_media_description(SalMediaDescription *desc);
int set_local_body(const Content &body);
int set_local_body(const Content &&body);
SalMediaDescription *get_remote_media_description() {return this->remote_media;}
const Content &get_remote_body() const {return this->remote_body;}
SalMediaDescription *get_final_media_description();
int call(const char *from, const char *to, const char *subject);
int notify_ringing(bool_t early_media);
int accept();
......@@ -63,7 +62,7 @@ public:
const char *get_remote_tag() {return belle_sip_dialog_get_remote_tag(this->dialog);}
void set_replaces(const char *call_id, const char *from_tag, const char *to_tag);
void set_sdp_handling(SalOpSDPHandling handling);
// Implementation of SalMessageOpInterface
int send_message(const char *from, const char *to, const char* content_type, const char *msg, const char *peer_uri) override;
int reply(SalReason reason) override {return SalOp::reply_message(reason);}
......@@ -71,18 +70,18 @@ public:
private:
virtual void fill_cbs() override;
void set_released();
void set_error(belle_sip_response_t* response, bool_t fatal);
void call_terminated(belle_sip_server_transaction_t* server_transaction, int status_code, belle_sip_request_t* cancel_request);
void reset_descriptions();
int parse_sdp_body(const Content &body,belle_sdp_session_description_t** session_desc, SalReason *error);
void sdp_process();
void handle_body_from_response(belle_sip_response_t* response);
SalReason process_body_for_invite(belle_sip_request_t* invite);
SalReason process_body_for_ack(belle_sip_request_t *ack);
void handle_offer_answer_response(belle_sip_response_t* response);
void fill_invite(belle_sip_request_t* invite);
void cancelling_invite(const SalErrorInfo *info);
int refer_to(belle_sip_header_refer_to_t* refer_to, belle_sip_header_referred_by_t* referred_by);
......@@ -90,7 +89,7 @@ private:
void notify_last_response(SalCallOp *newcall);
void process_refer(const belle_sip_request_event_t *event, belle_sip_server_transaction_t *server_transaction);
void process_notify(const belle_sip_request_event_t *event, belle_sip_server_transaction_t* server_transaction);
static void set_addr_to_0000(char value[], size_t sz);
static int is_media_description_acceptable(SalMediaDescription *md);
static bool_t is_a_pending_invite_incoming_transaction(belle_sip_transaction_t *tr);
......@@ -99,14 +98,14 @@ private:
static belle_sip_header_reason_t *make_reason_header( const SalErrorInfo *info);
static belle_sip_header_allow_t *create_allow(bool_t enable_update);
static std::vector<char> marshal_media_description(belle_sdp_session_description_t *session_desc, belle_sip_error_code &error);
// belle_sip_message handlers
static int set_custom_body(belle_sip_message_t *msg, const Content &body);
static int set_sdp(belle_sip_message_t *msg,belle_sdp_session_description_t* session_desc);
static int set_sdp_from_desc(belle_sip_message_t *msg, const SalMediaDescription *desc);
static void process_io_error_cb(void *user_ctx, const belle_sip_io_error_event_t *event);
static Content extract_body(belle_sip_message_t *message);
// Callbacks
static int vfu_retry_cb (void *user_data, unsigned int events);
static void process_response_cb(void *op_base, const belle_sip_response_event_t *event);
......@@ -114,10 +113,10 @@ private:
static void process_transaction_terminated_cb(void *user_ctx, const belle_sip_transaction_terminated_event_t *event);
static void process_request_event_cb(void *op_base, const belle_sip_request_event_t *event);
static void process_dialog_terminated_cb(void *ctx, const belle_sip_dialog_terminated_event_t *event);
// Private constants
static const size_t SIP_MESSAGE_BODY_LIMIT = 16*1024; // 16kB
// Attributes
SalMediaDescription *local_media = NULL;
SalMediaDescription *remote_media = NULL;
......@@ -127,4 +126,4 @@ private:
LINPHONE_END_NAMESPACE
#endif
#endif // ifndef _SAL_CALL_OP_H_
#include "event_op.h"
/*
* event-op.cpp
* Copyright (C) 2017 Belledonne Communications SARL
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "sal/event-op.h"
using namespace std;
......
/*
event_op.h
Copyright (C) 2017 Belledonne Communications <info@belledonne-communications.com>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
* event-op.h
* Copyright (C) 2017 Belledonne Communications SARL
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _SAL_EVENT_OP_H_
#define _SAL_EVENT_OP_H_
#include "sal_op.h"
#include "sal/op.h"
LINPHONE_BEGIN_NAMESPACE
class SalEventOp: public SalOp {
public:
SalEventOp(Sal *sal): SalOp(sal) {}
SalEventOp(Sal *sal): SalOp(sal) {}
};
class SalSubscribeOp: public SalEventOp {
public:
SalSubscribeOp(Sal *sal): SalEventOp(sal) {}
int subscribe(const char *from, const char *to, const char *eventname, int expires, const SalBodyHandler *body_handler);
int unsubscribe() {return SalOp::unsubscribe();}
int accept();
......@@ -44,7 +43,7 @@ public:
private:
virtual void fill_cbs() override;
void handle_notify(belle_sip_request_t *req, const char *eventname, SalBodyHandler* body_handler);
static void subscribe_process_io_error_cb(void *user_ctx, const belle_sip_io_error_event_t *event);
static void subscribe_response_event_cb(void *op_base, const belle_sip_response_event_t *event);
static void subscribe_process_timeout_cb(void *user_ctx, const belle_sip_timeout_event_t *event);
......@@ -57,18 +56,18 @@ private:
class SalPublishOp: public SalEventOp {
public:
SalPublishOp(Sal *sal): SalEventOp(sal) {}
SalPublishOp(Sal *sal): SalEventOp(sal) {}
int publish(const char *from, const char *to, const char *eventname, int expires, const SalBodyHandler *body_handler);
int unpublish();
private:
virtual void fill_cbs() override;
static void publish_response_event_cb(void *userctx, const belle_sip_response_event_t *event);
static void publish_refresher_listener_cb (belle_sip_refresher_t* refresher,void* user_pointer,unsigned int status_code,const char* reason_phrase, int will_retry);
};
LINPHONE_END_NAMESPACE
#endif
#endif // ifndef _SAL_EVENT_OP_H_
/*
message_op_interface.h
Copyright (C) 2017 Belledonne Communications <info@belledonne-communications.com>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
* message-op-interface.h
* Copyright (C) 2017 Belledonne Communications SARL
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _SAL_MESSAGE_OP_INTERFACE_H_
#define _SAL_MESSAGE_OP_INTERFACE_H_
......@@ -25,6 +24,7 @@ LINPHONE_BEGIN_NAMESPACE
class SalMessageOpInterface {
public:
virtual ~SalMessageOpInterface() = default;
int send_message(const char *from, const char *to, const char *msg) {return send_message(from,to,"text/plain",msg, nullptr);}
virtual int send_message(const char *from, const char *to, const char* content_type, const char *msg, const char *peer_uri) = 0;
virtual int reply(SalReason reason) = 0;
......@@ -35,4 +35,4 @@ protected:
LINPHONE_END_NAMESPACE
#endif
#endif // ifndef _SAL_MESSAGE_OP_INTERFACE_H_
#include "message_op.h"
/*
* message-op.cpp
* Copyright (C) 2017 Belledonne Communications SARL
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "sal/message-op.h"
using namespace std;
......
/*
message_op.h
Copyright (C) 2017 Belledonne Communications <info@belledonne-communications.com>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef _SAL_MASSAGE_OP_H_
#define _SAL_MASSAGE_OP_H_
#include "sal_op.h"
#include "message_op_interface.h"
* message-op.h
* Copyright (C) 2017 Belledonne Communications SARL
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _SAL_MESSAGE_OP_H_
#define _SAL_MESSAGE_OP_H_
#include "sal/op.h"
#include "sal/message-op-interface.h"
LINPHONE_BEGIN_NAMESPACE
class SalMessageOp: public SalOp, public SalMessageOpInterface {
public:
SalMessageOp(Sal *sal): SalOp(sal) {}
int send_message(const char *from, const char *to, const char* content_type, const char *msg, const char *peer_uri) override;
int reply(SalReason reason) override {return SalOp::reply_message(reason);}
private:
virtual void fill_cbs() override;
void process_error();
static void process_io_error_cb(void *user_ctx, const belle_sip_io_error_event_t *event);
static void process_response_event_cb(void *op_base, const belle_sip_response_event_t *event);
static void process_timeout_cb(void *user_ctx, const belle_sip_timeout_event_t *event);
......@@ -44,4 +43,4 @@ private:
LINPHONE_END_NAMESPACE
#endif
#endif // ifndef _SAL_MESSAGE_OP_H_
/*
* op.cpp
* Copyright (C) 2017 Belledonne Communications SARL
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <cstring>
#include "sal_op.h"
#include "sal/op.h"
#include "bellesip_sal/sal_impl.h"
using namespace std;
......
/*
sal_op.h
Copyright (C) 2017 Belledonne Communications <info@belledonne-communications.com>
* op.h
* Copyright (C) 2017 Belledonne Communications SARL
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef _SAL_OP_H_
#define _SAL_OP_H_
......@@ -23,9 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <bctoolbox/list.h>
#include <bctoolbox/port.h>
#include <belle-sip/types.h>
#include "sal.h"
#include "sal.hpp"
#include "c-wrapper/internal/c-sal.h"
#include "content/content.h"
#include "sal/sal.h"
LINPHONE_BEGIN_NAMESPACE
......@@ -33,16 +34,15 @@ class SalOp {
public:
SalOp(Sal *sal);
virtual ~SalOp();
SalOp *ref();
void *unref();
Sal *get_sal() const {return this->root;}
void set_user_pointer(void *up) {this->user_pointer=up;}