From ad6f4e0bbfc063617c415e346bbd8e2d52df5a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= <oleavr@gmail.com>
Date: Wed, 9 Jun 2021 00:26:37 +0200
Subject: [PATCH] Wire up Relay members and __repr__

---
 src/_frida.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/_frida.c b/src/_frida.c
index 11d2b61..805197c 100644
--- a/src/_frida.c
+++ b/src/_frida.c
@@ -248,6 +248,10 @@ struct _PyScript
 struct _PyRelay
 {
   PyGObject parent;
+  PyObject * address;
+  PyObject * username;
+  PyObject * password;
+  PyObject * kind;
 };
 
 struct _PyPortalMembership
@@ -430,6 +434,9 @@ static PyObject * PyScript_eternalize (PyScript * self);
 static PyObject * PyScript_post (PyScript * self, PyObject * args, PyObject * kw);
 
 static int PyRelay_init (PyRelay * self, PyObject * args, PyObject * kw);
+static void PyRelay_init_from_handle (PyRelay * self, FridaRelay * handle);
+static void PyRelay_dealloc (PyRelay * self);
+static PyObject * PyRelay_repr (PyRelay * self);
 
 static PyObject * PyPortalMembership_new_take_handle (FridaPortalMembership * handle);
 static PyObject * PyPortalMembership_terminate (PyPortalMembership * self);
@@ -650,6 +657,15 @@ static PyMethodDef PyScript_methods[] =
   { NULL }
 };
 
+static PyMemberDef PyRelay_members[] =
+{
+  { "address", T_OBJECT_EX, G_STRUCT_OFFSET (PyRelay, address), READONLY, "Network address or address:port of the TURN server." },
+  { "username", T_OBJECT_EX, G_STRUCT_OFFSET (PyRelay, username), READONLY, "The TURN username to use for the allocate request." },
+  { "password", T_OBJECT_EX, G_STRUCT_OFFSET (PyRelay, password), READONLY, "The TURN password to use for the allocate request." },
+  { "kind", T_OBJECT_EX, G_STRUCT_OFFSET (PyRelay, kind), READONLY, "Relay kind. One of: turn-udp, turn-tcp, turn-tls." },
+  { NULL }
+};
+
 static PyMethodDef PyPortalMembership_methods[] =
 {
   { "terminate", (PyCFunction) PyPortalMembership_terminate, METH_NOARGS, "Terminate the membership." },
@@ -1226,12 +1242,12 @@ static PyTypeObject PyRelayType =
   "_frida.Relay",                               /* tp_name           */
   sizeof (PyRelay),                             /* tp_basicsize      */
   0,                                            /* tp_itemsize       */
-  NULL,                                         /* tp_dealloc        */
+  (destructor) PyRelay_dealloc,                 /* tp_dealloc        */
   PYFRIDA_NO_PRINT_FUNC_OR_VECTORCALL_OFFSET,   /* tp_{print,vco}    */
   NULL,                                         /* tp_getattr        */
   NULL,                                         /* tp_setattr        */
   NULL,                                         /* tp_compare        */
-  NULL,                                         /* tp_repr           */
+  (reprfunc) PyRelay_repr,                      /* tp_repr           */
   NULL,                                         /* tp_as_number      */
   NULL,                                         /* tp_as_sequence    */
   NULL,                                         /* tp_as_mapping     */
@@ -1250,7 +1266,7 @@ static PyTypeObject PyRelayType =
   NULL,                                         /* tp_iter           */
   NULL,                                         /* tp_iternext       */
   NULL,                                         /* tp_methods        */
-  NULL,                                         /* tp_members        */
+  PyRelay_members,                              /* tp_members        */
   NULL,                                         /* tp_getset         */
   &PyGObjectType,                               /* tp_base           */
   NULL,                                         /* tp_dict           */
@@ -1260,7 +1276,7 @@ static PyTypeObject PyRelayType =
   (initproc) PyRelay_init,                      /* tp_init           */
 };
 
-PYFRIDA_DEFINE_TYPE (Relay, NULL, g_object_unref);
+PYFRIDA_DEFINE_TYPE (Relay, PyRelay_init_from_handle, g_object_unref);
 
 static PyTypeObject PyPortalMembershipType =
 {
@@ -4251,6 +4267,8 @@ PyRelay_init (PyRelay * self, PyObject * args, PyObject * kw)
 
   PyGObject_take_handle (&self->parent, handle, &PYFRIDA_TYPE_SPEC (Relay));
 
+  PyRelay_init_from_handle (self, handle);
+
   result = 0;
 
 beach:
@@ -4262,6 +4280,36 @@ beach:
   return result;
 }
 
+static void
+PyRelay_init_from_handle (PyRelay * self, FridaRelay * handle)
+{
+  self->address = PyUnicode_FromUTF8String (frida_relay_get_address (handle));
+  self->username = PyUnicode_FromUTF8String (frida_relay_get_username (handle));
+  self->password = PyUnicode_FromUTF8String (frida_relay_get_password (handle));
+  self->kind = PyGObject_marshal_enum (frida_relay_get_kind (handle), FRIDA_TYPE_RELAY_KIND);
+}
+
+static void
+PyRelay_dealloc (PyRelay * self)
+{
+  Py_XDECREF (self->kind);
+  Py_XDECREF (self->password);
+  Py_XDECREF (self->username);
+  Py_XDECREF (self->address);
+
+  PyGObjectType.tp_dealloc ((PyObject *) self);
+}
+
+static PyObject *
+PyRelay_repr (PyRelay * self)
+{
+  return PyRepr_FromFormat ("Relay(address=%R, username=%R, password=%R, kind=%R)",
+      self->address,
+      self->username,
+      self->password,
+      self->kind);
+}
+
 
 static PyObject *
 PyPortalMembership_new_take_handle (FridaPortalMembership * handle)