From 74844e0448889d4a5a4cc06de26f8895a78e8ea3 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 27 May 2013 12:24:16 +0200
Subject: [PATCH] add alias parameter in via for Registers add declarations for
 new SUBSCRIBE/NOTIFY/PUBLISH api

---
 coreapi/bellesip_sal/sal_op_impl.c |   6 ++
 coreapi/event.h                    | 125 +++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 coreapi/event.h

diff --git a/coreapi/bellesip_sal/sal_op_impl.c b/coreapi/bellesip_sal/sal_op_impl.c
index 7e24389fb..78957f2af 100644
--- a/coreapi/bellesip_sal/sal_op_impl.c
+++ b/coreapi/bellesip_sal/sal_op_impl.c
@@ -207,6 +207,12 @@ static int _sal_op_send_request_with_contact(SalOp* op, belle_sip_request_t* req
 			}
 			belle_sip_uri_fix(next_hop_uri);
 		}
+		if (strcmp(belle_sip_request_get_method(request),"REGISTER")==0 && transport && 
+			(strcasecmp(transport,"TCP")==0 || strcasecmp(transport,"TLS")==0)){
+			/*RFC 5923: add 'alias' parameter to tell the server that we want it to keep the connection for future requests*/
+			belle_sip_header_via_t *via=belle_sip_message_get_header_by_type(BELLE_SIP_MESSAGE(request),belle_sip_header_via_t);
+			belle_sip_parameters_set_parameter(BELLE_SIP_PARAMETERS(via),"alias",NULL);
+		}
 	}
 
 	client_transaction = belle_sip_provider_create_client_transaction(prov,request);
diff --git a/coreapi/event.h b/coreapi/event.h
new file mode 100644
index 000000000..68417a846
--- /dev/null
+++ b/coreapi/event.h
@@ -0,0 +1,125 @@
+/*
+linphone
+Copyright (C) 2000 - 2010 Simon MORLAT (simon.morlat@linphone.org)
+
+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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+#ifndef LINPHONEEVENT_H
+#define LINPHONEEVENT_H
+
+struct _LinphoneEvent;
+
+typedef struct _LinphoneEvent LinphoneEvent;
+
+/**
+ * Enum for subscription direction (incoming or outgoing).
+**/
+enum _LinphoneSubscriptionDir{
+	LinphoneSubscriptionIncoming,
+	LinphoneSubscriptionOutgoing
+};
+
+/**
+ * Typedef alias for _LinphoneSubscriptionDir
+**/
+typedef _LinphoneSubscriptionDir LinphoneSubscriptionDir;
+
+/**
+ * Enum for subscription states.
+**/
+enum _LinphoneSubscriptionState{
+	LinphoneSubscriptionNone, /**< Initial state, should not be used.**/
+	LinphoneSubscriptionOutoingInit, /**<An outgoing subcription was created*/
+	LinphoneSubscriptionIncomingReceived, /**<An incoming subcription is received*/
+	LinphoneSubscriptionPending, /**<Subscription is pending, waiting for user approval*/
+	LinphoneSubscriptionActive, /**<Subscription is accepted.*/
+	LinphoneSubscriptionTerminated, /**<Subscription is terminated normally*/
+	LinphoneSubscriptionError /**<Subscription encountered an error, indicated by linphone_event_get_reason()*/
+};
+
+typedef _LinphoneSubscriptionState LinphoneSubscriptionState;
+
+/**
+ * Callback prototype for notifying the application about notification received from the network.
+ * If the notification is not associated with any outgoing subscription, then the LinphoneEvent argument is NULL.
+**/
+typedef void (*LinphoneEventIncomingNotifyCb)(LinphoneCore *lc, LinphoneEvent *lev, const char *event_name, const LinphoneContent *body);
+
+/**
+ * Callback prototype for notifying the application about changes of subscription states, including arrival of new subscriptions.
+**/ 
+typedef void (*LinphoneSubscriptionStateChangedCb)(LinphoneCore *lc, LinphoneEvent *lev, LinphoneSubcriptionState state);
+
+/**
+ * Create an outgoing subscription, specifying the destination resource, the event name, and an optional content body.
+ * If accepted, the subscription runs for a finite period, but is automatically renewed if not terminated before.
+ * @param lc the #LinphoneCore
+ * @param resource the destination resource
+ * @param event the event name
+ * @param expires the whished duration of the subscription
+ * @param body an optional body, may be NULL.
+ * @return a LinphoneEvent holding the context of the created subcription.
+**/
+LinphoneEvent *linphone_core_subscribe(LinphoneCore *lc, const LinphoneAddress *resource, const char *event, int expires, const LinphoneContent *body);
+
+/**
+ * Update an outgoing subscription.
+ * @param lev a LinphoneEvent
+ * @param body an optional body to include in the subscription update, may be NULL.
+**/
+void linphone_event_update_subscribe(LinphoneEvent *lev, const LinphoneContent *body);
+
+
+/**
+ * Accept an incoming subcription.
+**/
+void linphone_event_accept_subscription(LinphoneEvent *lev);
+/**
+ * Deny an incoming subscription with given reason.
+**/
+void linphone_event_deny_subscription(LinphoneEvent *lev, LinphoneReason reason);
+/**
+ * Send a notification.
+ * @param lev a #LinphoneEvent corresponding to an incoming subscription previously received and accepted.
+ * @param body an optional body containing the actual notification data.
+ **/
+void linphone_event_notify(LinphoneEvent *lev, const LinphoneContent *body);
+
+
+/**
+ * Publish an event.
+ * After expiry, the publication is refreshed unless it is terminated before.
+ * @param lc the #LinphoneCore
+ * @param resource the resource uri for the event
+ * @param event the event name
+ * @param expires the lifetime of the publication
+ * @param body the actual published data
+**/
+LinphoneEvent *linphone_core_publish(LinphoneCore *lc, const LinphoneAddress *resource, const char *event, int expires, const LinphoneContent *body);
+
+/**
+ * Update a publication.
+ * @param lev the #LinphoneEvent
+ * @param body the new data to be published
+**/
+void linphone_event_update_publish(LinphoneEvent *lev, const LinphoneContent *body);
+
+/**
+ * Terminate an incoming or outgoing subscription that was previously acccepted, or a previous publication.
+**/
+void linphone_event_terminate(LinphoneEvent *lev);
+
+
+#endif