1 files changed, 15 insertions, 0 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 75210830..a78b06b6 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -123,6 +123,18 @@ int getclient_id(const Messenger *m, int32_t friendnumber, uint8_t *client_id)
 
     return -1;
 }
+
+/*  return friend connection id on success.
+ *  return -1 if failure.
+ */
+int getfriendcon_id(const Messenger *m, int32_t friendnumber)
+{
+    if (friend_not_valid(m, friendnumber))
+        return -1;
+
+    return m->friendlist[friendnumber].friendcon_id;
+}
+
 /* TODO: Another checksum algorithm might be better.
  *
  *  return a uint16_t that represents the checksum of address of length len.
@@ -1595,6 +1607,9 @@ Messenger *new_messenger(Messenger_Options *options)
 /* Run this before closing shop. */
 void kill_messenger(Messenger *m)
 {
+    if (!m)
+        return;
+
     uint32_t i;
 
     kill_friend_connections(m->fr_c);