First attempt to send/receive auth messages

There's probably only so far I can get with this while I'm on a plane
and can't test it...

diff --git a/chime-call-audio.c b/chime-call-audio.c
index 896b5a7c5203fa91e26dea78199fb48bd17b0379..afd87bb1ef1db64416dd079ed1568791e9f03ffb 100644 (file)
--- a/chime-call-audio.c
+++ b/chime-call-audio.c
@@ -21,6 +21,10 @@
 
 #include <libsoup/soup.h>
 
+#include "protobuf/auth_message.pb-c.h"
+#include "protobuf/rt_message.pb-c.h"
+#include "protobuf/data_message.pb-c.h"
+
 #include <arpa/inet.h>
 
 struct _ChimeCallAudio {
@@ -39,14 +43,71 @@ enum xrp_pkt_type {
        XRP_DATA_MESSAGE = 4,
 };
 
+static void audio_send_packet(ChimeCallAudio *audio, enum xrp_pkt_type type, const ProtobufCMessage *message)
+{
+       size_t len = protobuf_c_message_get_packed_size(message);
+
+       len += sizeof(struct xrp_header);
+       struct xrp_header *hdr = g_malloc0(len);
+       hdr->type = htons(type);
+       hdr->len = htons(len);
+       protobuf_c_message_pack(message, (void *)(hdr + 1));
+       soup_websocket_connection_send_binary(audio->ws, hdr, len);
+       g_free(hdr);
+}
+
+static void audio_send_auth_packet(ChimeCallAudio *audio)
+{
+       ChimeConnection *cxn = chime_call_get_connection(audio->call);
+       if (!cxn)
+               return;
+
+       ChimeConnectionPrivate *priv = CHIME_CONNECTION_GET_PRIVATE (cxn);
+       AuthMessage msg;
+       auth_message__init(&msg);
+       msg.message_type = AUTH_MESSAGE_TYPE__REQUEST;
+       msg.has_message_type = TRUE;
+
+       msg.call_id = 0;
+       msg.has_call_id = TRUE;
+
+       msg.call_uuid = (char *)chime_call_get_uuid(audio->call);
+
+       msg.service_type = SERVICE_TYPE__FULL_DUPLEX;
+       msg.has_service_type = TRUE;
+
+       msg.profile_id = 0;
+       msg.has_profile_id = TRUE;
+
+       msg.profile_uuid = (char *)chime_connection_get_profile_id(cxn);
+
+       /* XX: What if it *just* expired? We'll need to renew it and try again? */
+       msg.session_token = priv->session_token;
+
+       msg.codec = 6; /* Opus Low. Later... */
+       msg.has_codec = TRUE;
+
+       msg.flags = FLAGS__FLAG_MUTE;
+       msg.has_flags = TRUE;
+
+       audio_send_packet(audio, XRP_AUTH_MESSAGE, &msg.base);
+}
 static gboolean audio_receive_rt_msg(ChimeCallAudio *audio, gconstpointer pkt, gsize len)
 {
        return FALSE;
 }
 static gboolean audio_receive_auth_msg(ChimeCallAudio *audio, gconstpointer pkt, gsize len)
 {
-       return FALSE;
+       AuthMessage *msg = auth_message__unpack(NULL, len, pkt);
+       if (!msg)
+               return FALSE;
+
+
+       printf("Got AuthMessage authorised %d %d\n", msg->has_authorized, msg->authorized);
+       auth_message__free_unpacked(msg, NULL);
+       return TRUE;
 }
+
 static gboolean audio_receive_data_msg(ChimeCallAudio *audio, gconstpointer pkt, gsize len)
 {
        return FALSE;
@@ -74,10 +135,10 @@ static gboolean audio_receive_packet(ChimeCallAudio *audio, gconstpointer pkt, g
        }
        return FALSE;
 }
+
 static void on_audiows_closed(SoupWebsocketConnection *ws, gpointer _audio)
 {
        /* XXX: Reconnect it */
-
 }
 
 static void on_audiows_message(SoupWebsocketConnection *ws, gint type,
@@ -119,6 +180,7 @@ static void audio_ws_connect_cb(GObject *obj, GAsyncResult *res, gpointer _task)
        g_signal_connect(G_OBJECT(ws), "closed", G_CALLBACK(on_audiows_closed), audio);
        g_signal_connect(G_OBJECT(ws), "message", G_CALLBACK(on_audiows_message), audio);
 
+       audio_send_auth_packet(audio);
        g_task_return_pointer(task, audio, free_audio);
        g_object_unref(task);
 }

diff --git a/chime-call.c b/chime-call.c
index 77f8062513dc55c3364a80e53dc78a5d497dcedb..deb5b5d57e1412bb42630bb657f487d3dbe6f431 100644 (file)
--- a/chime-call.c
+++ b/chime-call.c
@@ -159,6 +159,13 @@ static void chime_call_init(ChimeCall *self)
 }
 
 
+/* Internal only */
+ChimeConnection *chime_call_get_connection(ChimeCall *self)
+{
+       g_return_val_if_fail(CHIME_IS_CALL(self), NULL);
+
+       return self->cxn;
+}
 
 gboolean chime_call_get_ongoing(ChimeCall *self)
 {

diff --git a/chime-connection-private.h b/chime-connection-private.h
index ce48ec065f2b5ac09502128e11589ea438253763..a62f668a45a9c150cc4487818ac37ea55793105f 100644 (file)
--- a/chime-connection-private.h
+++ b/chime-connection-private.h
@@ -38,6 +38,7 @@
 #define soup_websocket_connection_get_close_data chime_websocket_connection_get_close_data
 #define soup_websocket_connection_get_state chime_websocket_connection_get_state
 #define soup_websocket_connection_send_text chime_websocket_connection_send_text
+#define soup_websocket_connection_send_binary chime_websocket_connection_send_binary
 #define soup_websocket_connection_close chime_websocket_connection_close
 #define soup_session_websocket_connect_async chime_session_websocket_connect_async
 #define soup_session_websocket_connect_finish chime_session_websocket_connect_finish
@@ -229,6 +230,7 @@ void chime_init_calls(ChimeConnection *cxn);
 void chime_destroy_calls(ChimeConnection *cxn);
 ChimeCall *chime_connection_parse_call(ChimeConnection *cxn, JsonNode *node,
                                       GError **error);
+ChimeConnection *chime_call_get_connection(ChimeCall *self);
 
 /* login.c */
 void chime_initial_login(ChimeConnection *cxn);