Bump version to 0.7.0

Fix compile for DragonFlyBSD

.travis.yml

@@ -1,52 +0,0 @@
-language: c
-compiler:
-  - gcc
-  - clang
-
-before_script:
-  # Installing yasm (needed for compiling vpx) and openal
-  - sudo apt-get -yq install yasm libopenal-dev libconfig-dev libalut-dev libnotify-dev clang llvm-dev
-  # Installing libsodium, needed for toxcore
-  - git clone https://github.com/jedisct1/libsodium.git libsodium
-  - cd libsodium
-  - git checkout tags/1.0.3 > /dev/null
-  - ./autogen.sh > /dev/null
-  - ./configure > /dev/null
-  - make check -j2 || make check || exit 1 > /dev/null
-  - sudo make install > /dev/null
-  - cd ..
-  # Installing libopus, needed for audio encoding/decoding
-  - wget http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz
-  - tar xzf opus-1.1.tar.gz > /dev/null
-  - cd opus-1.1
-  - ./configure > /dev/null
-  - make -j2 || make || exit 1 > /dev/null
-  - sudo make install > /dev/null
-  - cd ..
-  # Installing vpx
-  - git clone https://chromium.googlesource.com/webm/libvpx libvpx
-  - cd libvpx
-  - ./configure --enable-shared > /dev/null
-  - make -j2 || make || exit 1 > /dev/null
-  - sudo make install > /dev/null
-  - cd ..
-  # Creating libraries links and updating cache
-  - sudo ldconfig > /dev/null
-  # Installing toxcore
-  - git clone https://github.com/irungentoo/toxcore.git toxcore
-  - cd toxcore
-  - autoreconf -i
-  - ./configure --disable-tests --disable-ntox --disable-daemon --enable-av
-  - make -j2 || make || exit 1
-  - sudo make install
-  - cd ..
-script:
-  - make -j2 || make || exit 1
-notifications:
-  email: false
-  
-  irc:
-    channels:
-      - "chat.freenode.net#tox-dev"
-    on_success: always
-    on_failure: always

INSTALL.md

@@ -10,11 +10,13 @@
 <a name="deps" />
 ## Dependencies
 | Name                                                 | Needed by                  | Debian package      |
-|------------------------------------------------------|----------------------------|------------------|
+|------------------------------------------------------|----------------------------|---------------------|
 | [Tox Core](https://github.com/irungentoo/toxcore)    | BASE                       | *None*              |
 | [NCurses](https://www.gnu.org/software/ncurses)      | BASE                       | libncursesw5-dev    |
 | [LibConfig](http://www.hyperrealm.com/libconfig)     | BASE                       | libconfig-dev       |
 | [GNUmake](https://www.gnu.org/software/make)         | BASE                       | make                |
+| [libcurl](http://curl.haxx.se/)                      | BASE                       | libcurl4-openssl-dev|
+| [libqrencode](https://fukuchi.org/works/qrencode/)   | BASE                       | libqrencode-dev     |
 | [Tox Core AV](https://github.com/irungentoo/toxcore) | AUDIO                      | *None*              |
 | [OpenAL](http://openal.org)                          | AUDIO, SOUND NOTIFICATIONS | libopenal-dev       |
 | [OpenALUT](http://openal.org)                        | SOUND NOTIFICATIONS        | libalut-dev         |

Makefile

@@ -3,18 +3,18 @@ CFG_DIR = $(BASE_DIR)/cfg
 
 -include $(CFG_DIR)/global_vars.mk
 
-LIBS = libtoxcore ncursesw libconfig
+LIBS = libtoxcore ncursesw libconfig libqrencode
 
-CFLAGS = -std=gnu99 -pthread -Wall -g
+CFLAGS = -std=gnu99 -pthread -Wall -g -fstack-protector-all
 CFLAGS += '-DTOXICVER="$(VERSION)"' -DHAVE_WIDECHAR -D_XOPEN_SOURCE_EXTENDED -D_FILE_OFFSET_BITS=64
 CFLAGS += '-DPACKAGE_DATADIR="$(abspath $(DATADIR))"'
 CFLAGS += $(USER_CFLAGS)
 LDFLAGS = $(USER_LDFLAGS)
 
-OBJ = chat.o chat_commands.o configdir.o dns.o execute.o file_transfers.o notify.o
+OBJ = chat.o chat_commands.o configdir.o execute.o file_transfers.o notify.o
 OBJ += friendlist.o global_commands.o groupchat.o line_info.o input.o help.o autocomplete.o
 OBJ += log.o misc_tools.o prompt.o settings.o toxic.o toxic_strings.o windows.o message_queue.o
-OBJ += group_commands.o term_mplex.o avatars.o
+OBJ += group_commands.o term_mplex.o avatars.o name_lookup.o qr_code.o
 
 # Check on wich system we are running
 UNAME_S = $(shell uname -s)
@@ -24,6 +24,9 @@ endif
 ifeq ($(UNAME_S), FreeBSD)
     -include $(CFG_DIR)/systems/FreeBSD.mk
 endif
+ifeq ($(UNAME_S), DragonFly)
+    -include $(CFG_DIR)/systems/FreeBSD.mk
+endif
 ifeq ($(UNAME_S), OpenBSD)
     -include $(CFG_DIR)/systems/FreeBSD.mk
 endif
@@ -59,6 +62,10 @@ $(BUILD_DIR)/toxic: $(OBJ)
 	@echo "  LD    $(@:$(BUILD_DIR)/%=%)"
 	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/toxic $(OBJ) $(LDFLAGS)
 
+$(BUILD_DIR)/osx_video.o: $(SRC_DIR)/$(OSX_VIDEO)
+	@echo "  CC    $(@:$(BUILD_DIR)/)osx_video.o"
+	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/osx_video.o -c $(SRC_DIR)/$(OSX_VIDEO)
+
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c
 	@if [ ! -e $(BUILD_DIR) ]; then \
 		mkdir -p $(BUILD_DIR) ;\

README.md

@@ -1,4 +1,8 @@
-# Toxic [![Build Status](https://travis-ci.org/Tox/toxic.png?branch=master)](https://travis-ci.org/Tox/toxic)
+<a href="https://scan.coverity.com/projects/toxic-tox">
+  <img alt="Coverity Scan Build Status"
+       src="https://scan.coverity.com/projects/4975/badge.svg"/>
+</a>
+
 Toxic is a [Tox](https://tox.chat)-based instant messenging client which formerly resided in the [Tox core repository](https://github.com/irungentoo/toxcore), and is now available as a standalone application.
 
 [![Toxic Screenshot](https://i.imgur.com/san99Z2.png "Home Screen")](https://i.imgur.com/san99Z2.png)

cfg/checks/audio.mk

@@ -1,10 +1,10 @@
 # Variables for audio call support
 AUDIO_LIBS = libtoxav openal
 AUDIO_CFLAGS = -DAUDIO
-ifneq (, $(findstring device.o, $(OBJ)))
+ifneq (, $(findstring audio_device.o, $(OBJ)))
     AUDIO_OBJ = audio_call.o
 else
-    AUDIO_OBJ = audio_call.o device.o
+    AUDIO_OBJ = audio_call.o audio_device.o
 endif
 
 # Check if we can build audio support

cfg/checks/check_features.mk

@@ -9,7 +9,17 @@ endif
 # Check if we want build audio support
 AUDIO = $(shell if [ -z "$(DISABLE_AV)" ] || [ "$(DISABLE_AV)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
 ifneq ($(AUDIO), disabled)
-    -include $(CHECKS_DIR)/av.mk
+    -include $(CHECKS_DIR)/audio.mk
+endif
+
+# Check if we want build video support
+VIDEO = $(shell if [ -z "$(DISABLE_AV)" ] || [ "$(DISABLE_AV)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
+ifneq ($(X11), disabled)
+ifneq ($(AUDIO), disabled)
+ifneq ($(VIDEO), disabled)
+    -include $(CHECKS_DIR)/video.mk
+endif
+endif
 endif
 
 # Check if we want build sound notifications support

cfg/checks/sound_notifications.mk

@@ -1,10 +1,10 @@
 # Variables for sound notifications support
 SND_NOTIFY_LIBS = openal freealut
 SND_NOTIFY_CFLAGS = -DSOUND_NOTIFY
-ifneq (, $(findstring device.o, $(OBJ)))
+ifneq (, $(findstring audio_device.o, $(OBJ)))
     SND_NOTIFY_OBJ =
 else
-    SND_NOTIFY_OBJ = device.o
+    SND_NOTIFY_OBJ = audio_device.o
 endif
 
 # Check if we can build sound notifications support

cfg/checks/video.mk

@@ -0,0 +1,21 @@
+# Variables for video call support
+VIDEO_LIBS = libtoxav vpx x11
+VIDEO_CFLAGS = -DVIDEO
+ifneq (, $(findstring video_device.o, $(OBJ)))
+    VIDEO_OBJ = video_call.o
+else
+    VIDEO_OBJ = video_call.o video_device.o
+endif
+
+# Check if we can build video support
+CHECK_VIDEO_LIBS = $(shell pkg-config --exists $(VIDEO_LIBS) || echo -n "error")
+ifneq ($(CHECK_VIDEO_LIBS), error)
+    LIBS += $(VIDEO_LIBS)
+    CFLAGS += $(VIDEO_CFLAGS)
+    OBJ += $(VIDEO_OBJ)
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_VIDEO_LIBS = $(shell for lib in $(VIDEO_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without video support)
+    $(warning WARNING -- You will need these libraries for video support)
+    $(warning WARNING -- $(MISSING_VIDEO_LIBS))
+endif

cfg/global_vars.mk

@@ -1,5 +1,5 @@
 # Version
-TOXIC_VERSION = 0.6.0
+TOXIC_VERSION = 0.7.0
 REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
 ifneq (, $(findstring error, $(REV)))
     VERSION = $(TOXIC_VERSION)
@@ -16,7 +16,7 @@ MISC_DIR = $(BASE_DIR)/misc
 
 # Project files
 MANFILES = toxic.1 toxic.conf.5
-DATAFILES = DHTnodes DNSservers toxic.conf.example
+DATAFILES = DHTnodes nameservers toxic.conf.example
 DESKFILE = toxic.desktop
 SNDFILES = ToxicContactOnline.wav ToxicContactOffline.wav ToxicError.wav
 SNDFILES += ToxicRecvMessage.wav ToxicOutgoingCall.wav ToxicIncomingCall.wav

cfg/systems/Darwin.mk

@@ -6,5 +6,13 @@ PKG_CONFIG_PATH = $(shell export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/o
 LIBS := $(filter-out ncursesw, $(LIBS))
 
 # OS X ships a usable, recent version of ncurses, but calls it ncurses not ncursesw.
-LDFLAGS += -lncurses -lalut -ltoxav -ltoxcore -ltoxdns -lresolv -lconfig -ltoxencryptsave -g
+LDFLAGS += -lncurses -lalut -ltoxav -ltoxcore -lcurl -lconfig -ltoxencryptsave -g
 CFLAGS += -I/usr/local/opt/freealut/include/AL -I/usr/local/opt/glib/include/glib-2.0 -g
+
+OSX_LIBRARIES = -lobjc -lresolv
+OSX_FRAMEWORKS = -framework Foundation -framework CoreFoundation -framework AVFoundation \
+	-framework QuartzCore -framework CoreMedia
+OSX_VIDEO = osx_video.m
+
+LDFLAGS += $(OSX_LIBRARIES) $(OSX_FRAMEWORKS)
+OBJ += osx_video.o

cfg/systems/FreeBSD.mk

@@ -1,4 +1,4 @@
 # Specials options for freebsd systems
 LIBS := $(filter-out ncursesw, $(LIBS))
-LDFLAGS += -lncursesw
+LDFLAGS += -lncursesw -lcurl
 MANDIR = $(PREFIX)/man

cfg/systems/Linux.mk

@@ -1,4 +1,4 @@
 # Specials options for linux systems
 CFLAGS +=
-LDFLAGS += -ldl -lresolv -lrt
+LDFLAGS += -ldl -lrt -lcurl
 MANDIR = $(PREFIX)/share/man

doc/toxic.1

@@ -2,12 +2,12 @@
 .\"     Title: toxic
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2015-03-28
+.\"      Date: 2015-07-08
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC" "1" "2015\-03\-28" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC" "1" "2015\-07\-08" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -101,9 +101,9 @@ Use a SOCKS5 proxy: Requires [IP] [port]
 Use a HTTP proxy: Requires [IP] [port]
 .RE
 .PP
-\-r, \-\-dnslist
+\-r, \-\-namelist
 .RS 4
-Use specified DNSservers file
+Use specified nameservers list
 .RE
 .PP
 \-t, \-\-force\-tcp

doc/toxic.1.asc

@@ -53,8 +53,8 @@ OPTIONS
 -P, --HTTP-proxy::
     Use a HTTP proxy: Requires [IP] [port]
 
--r, --dnslist::
-    Use specified DNSservers file
+-r, --namelist::
+    Use specified nameservers list
 
 -t, --force-tcp::
     Force TCP connection (use this with proxies)

misc/DHTnodes

@@ -1,25 +1,17 @@
-192.254.75.102 33445 951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F
 144.76.60.215 33445 04119E835DF3E78BACF0F84235B300546AF8B936F035185E2A8E9E0A67C8924F
 23.226.230.47 33445 A09162D68618E742FFBCA1C2C70385E6679604B2D80EA6E84AD0996A1AC8A074
-178.62.125.224 33445 10B20C49ACBD968D7C80F2E8438F92EA51F189F4E70CFBBB2C2C8C799E97F03E
 178.21.112.187 33445 4B2C19E924972CB9B57732FB172F8A8604DE13EEDA2A6234E348983344B23057
 195.154.119.113 33445 E398A69646B8CEACA9F0B84F553726C1C49270558C57DF5F3C368F05A7D71354
 192.210.149.121 33445 F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67
-76.191.23.96 33445 93574A3FAB7D612FEA29FD8D67D3DD10DFD07A075A5D62E8AF3DD9F5D0932E11
 46.38.239.179 33445 F5A1A38EFB6BD3C2C8AF8B10D85F0F89E931704D349F1D0720C3C4059AF2440A
 178.62.250.138 33445 788236D34978D1D5BD822F0A5BEBD2C53C64CC31CD3149350EE27D4D9A2F9B6B
-78.225.128.39 33445 7A2306BFBA665E5480AE59B31E116BE9C04DCEFE04D9FE25082316FA34B4DA0C
 130.133.110.14 33445 461FA3776EF0FA655F1A05477DF1B3B614F7D6B124F7DB1DD4FE3C08B03B640F
 104.167.101.29 33445 5918AC3C06955962A75AD7DF4F80A5D7C34F7DB9E1498D2E0495DE35B3FE8A57
-195.154.109.148 33445 391C96CB67AE893D4782B8E4495EB9D89CF1031F48460C06075AA8CE76D50A21
-192.3.173.88 33445 3E1FFDEB667BFF549F619EC6737834762124F50A89C8D0DBF1DDF64A2DD6CD1B
 205.185.116.116 33445 A179B09749AC826FF01F37A9613F6B57118AE014D4196A0E1105A98F93A54702
 198.98.51.198 33445 1D5A5F2F5D6233058BF0259B09622FB40B482E4FA0931EB8FD3AB8E7BF7DAF6F
 80.232.246.79 33445 A7A060D553B017D9D8F038E265C7AFB6C70BAAC55070197F9C007432D0038E0F
 108.61.165.198 33445 8E7D0B859922EF569298B4D261A8CCB5FEA14FB91ED412A7603A585A25698832
 212.71.252.109 33445 C4CEB8C7AC607C6B374E2E782B3C00EA3A63B80D4910B8649CCACDD19F260819
 194.249.212.109 33445 3CEE1F054081E7A011234883BC4FC39F661A55B73637A5AC293DDF1251D9432B
-194.249.212.109 443 3CEE1F054081E7A011234883BC4FC39F661A55B73637A5AC293DDF1251D9432B
-103.38.216.87 33445 601AEE6FC8C17E8CD8F8F1FFC4D4AD84E59A73BE451F037194E7A404E3795320
 185.25.116.107 33445 DA4E4ED4B697F2E9B000EEFE3A34B554ACD3F45F5C96EAEA2516DD7FF9AF7B43
 192.99.168.140 33445 6A4D0607A296838434A6A7DDF99F50EF9D60A2C510BBF31FE538A25CB6B4652F

misc/DNSservers

@@ -1,2 +0,0 @@
-utox.org d3154f65d28a5b41a05d4ac7e4b39c6b1c233cc857fb365c56e8392737462a12
-toxme.se 5d72c517df6aec54f1e977a6b6f25914ea4cf7277a85027cd9f5196df17e0b13

misc/nameservers

@@ -0,0 +1,2 @@
+toxme.io 1A39E7A5D5FA9CF155C751570A32E625698A60A55F6D88028F949F66144F4F25
+

misc/toxic.conf.example

@@ -66,7 +66,7 @@ tox = {
   // Path for downloaded files
   // download_path="/home/USERNAME/Downloads/";
 
-  // Path for your avatar (file must be a .png and cannot exceed 16.3 KiB)
+  // Path for your avatar (file must be a .png and cannot exceed 64 KiB)
   // avatar_path="/home/USERNAME/Pictures/youravatar.png";
 
   // Path for chatlogs

src/audio_call.c

@@ -23,11 +23,17 @@
 #include "toxic.h"
 #include "windows.h"
 #include "audio_call.h"
-#include "device.h"
+#include "audio_device.h"
 #include "chat_commands.h"
 #include "global_commands.h"
 #include "line_info.h"
 #include "notify.h"
+#include "friendlist.h"
+#include "chat.h"
+
+#ifdef VIDEO
+#include "video_call.h"
+#endif /* VIDEO */
 
 #include <stdbool.h>
 #include <curses.h>
@@ -49,174 +55,165 @@
 #endif
 #endif
 
+extern FriendsList Friends;
+
 #define cbend pthread_exit(NULL)
 
-#define MAX_CALLS 10
-
-#define frame_size (av_DefaultSettings.audio_sample_rate * av_DefaultSettings.audio_frame_duration / 1000)
+#define frame_size (CallControl.audio_sample_rate * CallControl.audio_frame_duration / 1000)
 
 static int set_call(Call* call, bool start)
 {
     call->in_idx = -1;
     call->out_idx = -1;
+#ifdef VIDEO
+    call->vin_idx = -1;
+    call->vout_idx = -1;
+#endif /* VIDEO */
 
     if ( start ) {
         call->ttas = true;
 
-        if (pthread_mutex_init(&call->mutex, NULL) != 0)
+        if ( pthread_mutex_init(&call->mutex, NULL) != 0 )
             return -1;
     }
     else {
         call->ttid = 0;
-        if (pthread_mutex_destroy(&call->mutex) != 0)
+        if ( pthread_mutex_destroy(&call->mutex) != 0 )
                return -1;
     }
 
     return 0;
 }
 
-struct ASettings {
-    AudioError errors;
+void call_cb                 ( ToxAV *av, uint32_t friend_number, bool audio_enabled, bool video_enabled, void *user_data );
+void callstate_cb            ( ToxAV *av, uint32_t friend_number, uint32_t state, void *user_data );
+void receive_audio_frame_cb  ( ToxAV *av, uint32_t friend_number, int16_t const *pcm, size_t sample_count,
+                               uint8_t channels, uint32_t sampling_rate, void *user_data );
+void receive_video_frame_cb  ( ToxAV *av, uint32_t friend_number,
+                               uint16_t width, uint16_t height,
+                               uint8_t const *y, uint8_t const *u, uint8_t const *v, uint8_t const *a,
+                               int32_t ystride, int32_t ustride, int32_t vstride, int32_t astride, void *user_data );
 
-    ToxAv *av;
+void callback_recv_invite   ( Tox *m, uint32_t friend_number );
+void callback_recv_ringing  ( uint32_t friend_number );
+void callback_recv_starting ( uint32_t friend_number );
+void callback_recv_ending   ( uint32_t friend_number );
+void callback_call_started  ( uint32_t friend_number );
+void callback_call_canceled ( uint32_t friend_number );
+void callback_call_rejected ( uint32_t friend_number );
+void callback_call_ended    ( uint32_t friend_number );
 
-    ToxAvCSettings cs;
-
-    Call calls[MAX_CALLS];
-} ASettins;
-
-void callback_recv_invite   ( void* av, int32_t call_index, void *arg );
-void callback_recv_ringing  ( void* av, int32_t call_index, void *arg );
-void callback_recv_starting ( void* av, int32_t call_index, void *arg );
-void callback_recv_ending   ( void* av, int32_t call_index, void *arg );
-void callback_call_started  ( void* av, int32_t call_index, void *arg );
-void callback_call_canceled ( void* av, int32_t call_index, void *arg );
-void callback_call_rejected ( void* av, int32_t call_index, void *arg );
-void callback_call_ended    ( void* av, int32_t call_index, void *arg );
-void callback_requ_timeout  ( void* av, int32_t call_index, void *arg );
-void callback_peer_timeout  ( void* av, int32_t call_index, void *arg );
-void callback_media_change  ( void* av, int32_t call_index, void *arg );
-
-void write_device_callback( void* agent, int32_t call_index, const int16_t* PCM, uint16_t size, void* arg );
+void write_device_callback( uint32_t friend_number, const int16_t* PCM, uint16_t size );
 
 static void print_err (ToxWindow *self, const char *error_str)
 {
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", error_str);
 }
 
-ToxAv *init_audio(ToxWindow *self, Tox *tox)
+ToxAV *init_audio(ToxWindow *self, Tox *tox)
 {
-    ASettins.cs = av_DefaultSettings;
-    ASettins.cs.max_video_height = ASettins.cs.max_video_width = 0;
+    TOXAV_ERR_NEW error;
+    CallControl.audio_errors = ae_None;
+    CallControl.prompt = self;
+    CallControl.pending_call = false;
 
-    ASettins.errors = ae_None;
+    CallControl.av = toxav_new(tox, &error);
 
-    memset(ASettins.calls, 0, sizeof(ASettins.calls));
+    CallControl.audio_enabled = true;
+    CallControl.audio_bit_rate = 48;
+    CallControl.audio_sample_rate = 48000;
+    CallControl.audio_frame_duration = 10;
+    CallControl.audio_channels = 1;
 
+#ifndef VIDEO
+    CallControl.video_enabled = false;
+    CallControl.video_bit_rate = 0;
+    CallControl.video_frame_duration = 0;
+#endif /* VIDEO */
 
-    /* Streaming stuff from core */
+    memset(CallControl.calls, 0, sizeof(CallControl.calls));
 
-    ASettins.av = toxav_new(tox, MAX_CALLS);
+    if ( !CallControl.av ) {
+        CallControl.audio_errors |= ae_StartingCoreAudio;
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to init ToxAV");
 
-    if ( !ASettins.av ) {
-        ASettins.errors |= ae_StartingCoreAudio;
         return NULL;
     }
 
-    if ( init_devices(ASettins.av) == de_InternalError ) {
+    if ( init_devices(CallControl.av) == de_InternalError ) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to init devices");
-        toxav_kill(ASettins.av);
-        return ASettins.av = NULL;
+        toxav_kill(CallControl.av);
+
+        return CallControl.av = NULL;
     }
 
-    toxav_register_callstate_callback(ASettins.av, callback_call_started, av_OnStart, self);
-    toxav_register_callstate_callback(ASettins.av, callback_call_canceled, av_OnCancel, self);
-    toxav_register_callstate_callback(ASettins.av, callback_call_rejected, av_OnReject, self);
-    toxav_register_callstate_callback(ASettins.av, callback_call_ended, av_OnEnd, self);
-    toxav_register_callstate_callback(ASettins.av, callback_recv_invite, av_OnInvite, self);
+    toxav_callback_call(CallControl.av, call_cb, tox);
+    toxav_callback_call_state(CallControl.av, callstate_cb, NULL);
+    toxav_callback_audio_receive_frame(CallControl.av, receive_audio_frame_cb, NULL);
 
-    toxav_register_callstate_callback(ASettins.av, callback_recv_ringing, av_OnRinging, self);
-    toxav_register_callstate_callback(ASettins.av, callback_recv_starting, av_OnStart, self);
-    toxav_register_callstate_callback(ASettins.av, callback_recv_ending, av_OnEnd, self);
-
-    toxav_register_callstate_callback(ASettins.av, callback_requ_timeout, av_OnRequestTimeout, self);
-    toxav_register_callstate_callback(ASettins.av, callback_peer_timeout, av_OnPeerTimeout, self);
-    //toxav_register_callstate_callback(ASettins.av, callback_media_change, av_OnMediaChange, self);
-
-    toxav_register_audio_callback(ASettins.av, write_device_callback, NULL);
-
-    return ASettins.av;
+    return CallControl.av;
 }
 
 void terminate_audio()
 {
     int i;
     for (i = 0; i < MAX_CALLS; ++i)
-        stop_transmission(&ASettins.calls[i], i);
+        stop_transmission(&CallControl.calls[i], i);
 
-    if ( ASettins.av )
-        toxav_kill(ASettins.av);
+    if ( CallControl.av )
+        toxav_kill(CallControl.av);
 
     terminate_devices();
 }
 
-void read_device_callback (const int16_t* captured, uint32_t size, void* data)
+void read_device_callback(const int16_t* captured, uint32_t size, void* data)
 {
-    int32_t call_index = *((int32_t*)data); /* TODO: Or pass an array of call_idx's */
+    TOXAV_ERR_SEND_FRAME error;
+    uint32_t friend_number = *((uint32_t *)data); /* TODO: Or pass an array of call_idx's */
+    int64_t sample_count = ((int64_t) CallControl.audio_sample_rate) * \
+                           ((int64_t) CallControl.audio_frame_duration) / 1000;
 
-    uint8_t encoded_payload[RTP_PAYLOAD_SIZE];
-    int32_t payload_size = toxav_prepare_audio_frame(ASettins.av, call_index, encoded_payload, RTP_PAYLOAD_SIZE, captured, size);
-    if ( payload_size <= 0 || toxav_send_audio(ASettins.av, call_index, encoded_payload, payload_size) < 0 ) {
-        /*fprintf(stderr, "Could not encode audio packet\n");*/
-    }
+    if ( sample_count <= 0 || toxav_audio_send_frame(CallControl.av, friend_number,
+                                                     captured, sample_count,
+                                                     CallControl.audio_channels,
+                                                     CallControl.audio_sample_rate, &error) == false )
+    {}
 }
 
-void write_device_callback(void *agent, int32_t call_index, const int16_t* PCM, uint16_t size, void* arg)
+void write_device_callback(uint32_t friend_number, const int16_t* PCM, uint16_t size)
 {
-    (void)arg;
-    (void)agent;
-
-    if (call_index >= 0 && ASettins.calls[call_index].ttas) {
-        ToxAvCSettings csettings = ASettins.cs;
-        toxav_get_peer_csettings(ASettins.av, call_index, 0, &csettings);
-        write_out(ASettins.calls[call_index].out_idx, PCM, size, csettings.audio_channels);
-    }
+    if ( CallControl.calls[friend_number].ttas )
+        write_out(CallControl.calls[friend_number].out_idx, PCM, size, CallControl.audio_channels);
 }
 
 int start_transmission(ToxWindow *self, Call *call)
 {
-    if ( !self || !ASettins.av || self->call_idx == -1 ) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Could not prepare transmission");
+    if ( !self || !CallControl.av ) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to prepare transmission");
         return -1;
     }
 
-    /* Don't provide support for video */
-    if ( 0 != toxav_prepare_transmission(ASettins.av, self->call_idx, 0) ) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Could not prepare transmission");
-        return -1;
-    }
-
-    if ( !toxav_capability_supported(ASettins.av, self->call_idx, av_AudioDecoding) ||
-         !toxav_capability_supported(ASettins.av, self->call_idx, av_AudioEncoding) )
-        return -1;
-
     if (set_call(call, true) == -1)
         return -1;
 
-    ToxAvCSettings csettings;
-    toxav_get_peer_csettings(ASettins.av, self->call_idx, 0, &csettings);
+    DeviceError error = open_primary_device(input, &call->in_idx,
+            CallControl.audio_sample_rate, CallControl.audio_frame_duration, CallControl.audio_channels);
 
-    if ( open_primary_device(input, &call->in_idx,
-            csettings.audio_sample_rate, csettings.audio_frame_duration, csettings.audio_channels) != de_None )
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to open input device!");
+    if ( error != de_None ) {
+        if ( error == de_FailedStart)
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to start input device");
 
-    if ( register_device_callback(self->call_idx, call->in_idx,
-         read_device_callback, &self->call_idx, true) != de_None)
+        if ( error == de_InternalError )
+            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Internal error with opening input device");
+    }
+
+    if ( register_device_callback(self->num, call->in_idx,
+            read_device_callback, &self->num, true) != de_None)
         /* Set VAD as true for all; TODO: Make it more dynamic */
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to register input handler!");
 
     if ( open_primary_device(output, &call->out_idx,
-            csettings.audio_sample_rate, csettings.audio_frame_duration, csettings.audio_channels) != de_None ) {
+            CallControl.audio_sample_rate, CallControl.audio_frame_duration, CallControl.audio_channels) != de_None ) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to open output device!");
         call->has_output = 0;
     }
@@ -224,10 +221,15 @@ int start_transmission(ToxWindow *self, Call *call)
     return 0;
 }
 
-int stop_transmission(Call *call, int32_t call_index)
+int stop_transmission(Call *call, uint32_t friend_number)
 {
     if ( call->ttas ) {
-        toxav_kill_transmission(ASettins.av, call_index);
+        TOXAV_ERR_CALL_CONTROL error = TOXAV_ERR_CALL_CONTROL_OK;
+
+        if ( CallControl.call_state != TOXAV_FRIEND_CALL_STATE_FINISHED )
+            toxav_call_control(CallControl.av, friend_number, TOXAV_CALL_CONTROL_CANCEL, &error);
+
+        if ( error == TOXAV_ERR_CALL_CONTROL_OK ) {
             call->ttas = false;
 
             if ( call->in_idx != -1 )
@@ -236,10 +238,14 @@ int stop_transmission(Call *call, int32_t call_index)
             if ( call->out_idx != -1 )
                 close_device(output, call->out_idx);
 
-        if (set_call(call, false) == -1)
+            if ( set_call(call, false) == -1 )
                 return -1;
 
             return 0;
+        } else {
+
+            return -1;
+        }
     }
 
     return -1;
@@ -255,85 +261,187 @@ int stop_transmission(Call *call, int32_t call_index)
 /*
  * Callbacks
  */
-
-#define CB_BODY(call_idx, Arg, onFunc) do { ToxWindow* windows = (Arg); int i;\
-for (i = 0; i < MAX_WINDOWS_NUM; ++i) if (windows[i].onFunc != NULL) windows[i].onFunc(&windows[i], ASettins.av, call_idx); } while (0)
-
-void callback_recv_invite ( void* av, int32_t call_index, void* arg )
+void call_cb(ToxAV *av, uint32_t friend_number, bool audio_enabled, bool video_enabled, void *user_data)
 {
-    CB_BODY(call_index, arg, onInvite);
+    Tox *m = (Tox *) user_data;
+    CallControl.pending_call = true;
+    callback_recv_invite(m, friend_number);
 }
-void callback_recv_ringing ( void* av, int32_t call_index, void* arg )
+
+void callstate_cb(ToxAV *av, uint32_t friend_number, uint32_t state, void *user_data)
 {
-    CB_BODY(call_index, arg, onRinging);
-}
-void callback_recv_starting ( void* av, int32_t call_index, void* arg )
-{
-    ToxWindow* windows = arg;
-    int i;
-    for (i = 0; i < MAX_WINDOWS_NUM; ++i)
-        if (windows[i].onStarting != NULL && windows[i].call_idx == call_index) {
-            windows[i].onStarting(&windows[i], ASettins.av, call_index);
-            if ( 0 != start_transmission(&windows[i], &ASettins.calls[call_index])) {/* YEAH! */
-                line_info_add(&windows[i], NULL, NULL, NULL, SYS_MSG, 0, 0 , "Error starting transmission!");
+    CallControl.call_state = state;
+
+    switch ( state ) {
+        case ( TOXAV_FRIEND_CALL_STATE_ERROR ):
+            line_info_add(CallControl.prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, "ToxAV callstate error!");
+
+#ifdef VIDEO
+            callback_video_end(friend_number);
+#endif /* VIDEO */
+
+            stop_transmission(&CallControl.calls[friend_number], friend_number);
+            callback_call_ended(friend_number);
+            CallControl.pending_call = false;
+
+        break;
+        case ( TOXAV_FRIEND_CALL_STATE_FINISHED ):
+            if ( CallControl.pending_call )
+                callback_call_rejected(friend_number);
+            else
+                callback_call_ended(friend_number);
+
+#ifdef VIDEO
+            callback_recv_video_end(friend_number);
+            callback_video_end(friend_number);
+#endif /* VIDEO */
+
+            stop_transmission(&CallControl.calls[friend_number], friend_number);
+
+            /* Reset stored call state after finishing */
+            CallControl.call_state = 0;
+            CallControl.pending_call = false;
+
+        break;
+        default:
+            if ( CallControl.pending_call ) {
+                /* Start answered call */
+                callback_call_started(friend_number);
+                CallControl.pending_call = false;
+
+            } else {
+#ifdef VIDEO
+                /* Handle receiving client video call states */
+                if ( state & TOXAV_FRIEND_CALL_STATE_SENDING_V )
+                    callback_recv_video_starting(friend_number);
+                else if ( state & ~TOXAV_FRIEND_CALL_STATE_SENDING_V )
+                    callback_recv_video_end(friend_number);
+
+#endif /* VIDEO */
             }
+
+        break;
+    }
+}
+
+void receive_audio_frame_cb(ToxAV *av, uint32_t friend_number,
+                                    int16_t const *pcm, size_t sample_count,
+                                    uint8_t channels, uint32_t sampling_rate, void *user_data)
+{
+    write_device_callback(friend_number, pcm, frame_size);
+}
+
+void audio_bit_rate_status_cb(ToxAV *av, uint32_t friend_number, uint32_t audio_bit_rate,
+                              uint32_t video_bit_rate, void *user_data)
+{
+    CallControl.audio_bit_rate = audio_bit_rate;
+}
+
+void callback_recv_invite(Tox *m, uint32_t friend_number)
+{
+    if (friend_number >= Friends.max_idx)
+        return;
+
+    if (Friends.list[friend_number].chatwin == -1) {
+        if (get_num_active_windows() >= MAX_WINDOWS_NUM)
+            return;
+
+        Friends.list[friend_number].chatwin = add_window(m, new_chat(m, Friends.list[friend_number].num));
+    }
+
+    ToxWindow *windows = CallControl.prompt;
+    int i;
+
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
+        if (windows[i].onInvite != NULL && windows[i].num == friend_number) {
+            windows[i].onInvite(&windows[i], CallControl.av, friend_number, CallControl.call_state);
+        }
+    }
+}
+void callback_recv_ringing(uint32_t friend_number)
+{
+    ToxWindow *windows = CallControl.prompt;
+    int i;
+
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
+        if (windows[i].onRinging != NULL && windows[i].num == friend_number) {
+            windows[i].onRinging(&windows[i], CallControl.av, friend_number, CallControl.call_state);
+        }
+    }
+}
+void callback_recv_starting(uint32_t friend_number)
+{
+    ToxWindow* windows = CallControl.prompt;
+
+    int i;
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
+        if ( windows[i].onStarting != NULL && windows[i].num == friend_number ) {
+            windows[i].onStarting(&windows[i], CallControl.av, friend_number, CallControl.call_state);
+            if ( 0 != start_transmission(&windows[i], &CallControl.calls[friend_number]) ) /* YEAH! */
+                line_info_add(&windows[i], NULL, NULL, NULL, SYS_MSG, 0, 0 , "Error starting transmission!");
+
             return;
         }
+    }
 }
-void callback_recv_ending ( void* av, int32_t call_index, void* arg )
+void callback_recv_ending(uint32_t friend_number)
 {
-    CB_BODY(call_index, arg, onEnding);
-    stop_transmission(&ASettins.calls[call_index], call_index);
-}
+    ToxWindow *windows = CallControl.prompt;
+    int i;
 
-void callback_call_started ( void* av, int32_t call_index, void* arg )
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
+        if (windows[i].onEnding != NULL && windows[i].num == friend_number) {
+            windows[i].onEnding(&windows[i], CallControl.av, friend_number, CallControl.call_state);
+        }
+    }
+}
+void callback_call_started(uint32_t friend_number)
 {
-    ToxWindow* windows = arg;
+    ToxWindow* windows = CallControl.prompt;
+
     int i;
     for (i = 0; i < MAX_WINDOWS_NUM; ++i)
-        if (windows[i].onStart != NULL && windows[i].call_idx == call_index) {
-            windows[i].onStart(&windows[i], ASettins.av, call_index);
-            if ( 0 != start_transmission(&windows[i], &ASettins.calls[call_index]) ) {/* YEAH! */
+        if ( windows[i].onStart != NULL && windows[i].num == friend_number ) {
+            windows[i].onStart(&windows[i], CallControl.av, friend_number, CallControl.call_state);
+            if ( 0 != start_transmission(&windows[i], &CallControl.calls[friend_number]) ) {/* YEAH! */
                 line_info_add(&windows[i], NULL, NULL, NULL, SYS_MSG, 0, 0, "Error starting transmission!");
                 return;
             }
         }
 }
-void callback_call_canceled ( void* av, int32_t call_index, void* arg )
+void callback_call_canceled(uint32_t friend_number)
 {
-    CB_BODY(call_index, arg, onCancel);
+    ToxWindow *windows = CallControl.prompt;
+    int i;
 
-    /* In case call is active */
-    stop_transmission(&ASettins.calls[call_index], call_index);
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
+        if (windows[i].onCancel != NULL && windows[i].num == friend_number) {
+            windows[i].onCancel(&windows[i], CallControl.av, friend_number, CallControl.call_state);
+        }
+    }
 }
-void callback_call_rejected ( void* av, int32_t call_index, void* arg )
+void callback_call_rejected(uint32_t friend_number)
 {
-    CB_BODY(call_index, arg, onReject);
-}
-void callback_call_ended ( void* av, int32_t call_index, void* arg )
-{
-    CB_BODY(call_index, arg, onEnd);
-    stop_transmission(&ASettins.calls[call_index], call_index);
-}
+    ToxWindow *windows = CallControl.prompt;
+    int i;
 
-void callback_requ_timeout ( void* av, int32_t call_index, void* arg )
-{
-    CB_BODY(call_index, arg, onRequestTimeout);
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
+        if (windows[i].onReject != NULL && windows[i].num == friend_number) {
+            windows[i].onReject(&windows[i], CallControl.av, friend_number, CallControl.call_state);
+        }
+    }
 }
-void callback_peer_timeout ( void* av, int32_t call_index, void* arg )
+void callback_call_ended(uint32_t friend_number)
 {
-    CB_BODY(call_index, arg, onPeerTimeout);
-    stop_transmission(&ASettins.calls[call_index], call_index);
-    /* Call is stopped manually since there might be some other
-     * actions that one can possibly take on timeout
-     */
-    toxav_stop_call(ASettins.av, call_index);
-}
+    ToxWindow *windows = CallControl.prompt;
+    int i;
 
-// void callback_media_change(void* av, int32_t call_index, void* arg)
-// {
-  /*... TODO cancel all media change requests */
-// }
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
+        if (windows[i].onEnd != NULL && windows[i].num == friend_number) {
+            windows[i].onEnd(&windows[i], CallControl.av, friend_number, CallControl.call_state);
+        }
+    }
+}
 
 /*
  * End of Callbacks
@@ -345,33 +453,42 @@ void callback_peer_timeout ( void* av, int32_t call_index, void* arg )
  */
 void cmd_call(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
+    TOXAV_ERR_CALL error;
     const char *error_str;
 
-    if (argc != 0) {
+    if ( argc != 0 ) {
         error_str = "Unknown arguments.";
         goto on_error;
     }
 
-    if ( !ASettins.av ) {
-        error_str = "Audio not supported!";
+    if ( !CallControl.av ) {
+        error_str = "ToxAV not supported!";
         goto on_error;
     }
 
-    if (!self->stb->connection) {
+    if ( !self->stb->connection ) {
         error_str = "Friend is offline.";
         goto on_error;
     }
 
-    ToxAvError error = toxav_call(ASettins.av, &self->call_idx, self->num, &ASettins.cs, 30);
+    if ( CallControl.pending_call ) {
+        error_str = "Already a pending call!";
+        goto on_error;
+    }
 
-    if ( error != av_ErrorNone ) {
-        if ( error == av_ErrorAlreadyInCallWithPeer ) error_str = "Already in a call!";
+    toxav_call(CallControl.av, self->num, CallControl.audio_bit_rate, CallControl.video_bit_rate, &error);
+    if ( error != TOXAV_ERR_CALL_OK ) {
+        if ( error == TOXAV_ERR_CALL_FRIEND_ALREADY_IN_CALL ) error_str = "Already in a call!";
+        else if ( error == TOXAV_ERR_CALL_MALLOC ) error_str = "Memory allocation issue";
+        else if ( error == TOXAV_ERR_CALL_FRIEND_NOT_FOUND ) error_str = "Friend number invalid";
+        else if ( error == TOXAV_ERR_CALL_FRIEND_NOT_CONNECTED ) error_str = "Friend is valid but not currently connected";
         else error_str = "Internal error!";
 
         goto on_error;
     }
 
-    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Calling... idx: %d", self->call_idx);
+    CallControl.pending_call = true;
+    callback_recv_ringing(self->num);
 
     return;
 on_error:
@@ -380,29 +497,38 @@ on_error:
 
 void cmd_answer(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
+    TOXAV_ERR_ANSWER error;
     const char *error_str;
 
-    if (argc != 0) {
+    if ( argc != 0 ) {
         error_str = "Unknown arguments.";
         goto on_error;
     }
 
-    if ( !ASettins.av ) {
+    if ( !CallControl.av ) {
         error_str = "Audio not supported!";
         goto on_error;
     }
 
-    ToxAvError error = toxav_answer(ASettins.av, self->call_idx, &ASettins.cs);
+    if ( !CallControl.pending_call ) {
+        error_str = "No incoming call!";
+        goto on_error;
+    }
 
-    if ( error != av_ErrorNone ) {
-        if ( error == av_ErrorInvalidState ) error_str = "Cannot answer in invalid state!";
-        else if ( error == av_ErrorNoCall ) error_str = "No incoming call!";
+    toxav_answer(CallControl.av, self->num, CallControl.audio_bit_rate, CallControl.video_bit_rate, &error);
+    if ( error != TOXAV_ERR_ANSWER_OK ) {
+        if ( error == TOXAV_ERR_ANSWER_FRIEND_NOT_CALLING ) error_str = "No incoming call!";
+        else if ( error == TOXAV_ERR_ANSWER_CODEC_INITIALIZATION ) error_str = "Failed to initialize codecs!";
+        else if ( error == TOXAV_ERR_ANSWER_FRIEND_NOT_FOUND ) error_str = "Friend not found!";
+        else if ( error == TOXAV_ERR_ANSWER_INVALID_BIT_RATE ) error_str = "Invalid bit rate!";
         else error_str = "Internal error!";
 
         goto on_error;
     }
 
     /* Callback will print status... */
+    callback_recv_starting(self->num);
+    CallControl.pending_call = false;
 
     return;
 on_error:
@@ -413,27 +539,27 @@ void cmd_reject(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
 {
     const char *error_str;
 
-    if (argc != 0) {
+    if ( argc != 0 ) {
         error_str = "Unknown arguments.";
         goto on_error;
     }
 
-    if ( !ASettins.av ) {
+    if ( !CallControl.av ) {
         error_str = "Audio not supported!";
         goto on_error;
     }
 
-    ToxAvError error = toxav_reject(ASettins.av, self->call_idx, "Why not?");
-
-    if ( error != av_ErrorNone ) {
-        if ( error == av_ErrorInvalidState ) error_str = "Cannot reject in invalid state!";
-        else if ( error == av_ErrorNoCall ) error_str = "No incoming call!";
-        else error_str = "Internal error!";
-
+    if ( !CallControl.pending_call ) {
+        error_str = "No incoming call!";
         goto on_error;
     }
 
+    /* Manually send a cancel call control because call hasn't started */
+    toxav_call_control(CallControl.av, self->num, TOXAV_CALL_CONTROL_CANCEL, NULL);
+    CallControl.pending_call = false;
+
     /* Callback will print status... */
+    callback_call_rejected(self->num);
 
     return;
 on_error:
@@ -442,38 +568,38 @@ on_error:
 
 void cmd_hangup(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
-    const char *error_str;
+    const char *error_str = NULL;
 
-    if (argc != 0) {
+    if ( !self->is_call ) {
+        error_str = "Not in a call.";
+        goto on_error;
+    }
+
+    if ( argc != 0 ) {
         error_str = "Unknown arguments.";
         goto on_error;
     }
 
-    if ( !ASettins.av ) {
+    if ( !CallControl.av ) {
         error_str = "Audio not supported!";
         goto on_error;
     }
 
-    ToxAvError error;
+#ifdef VIDEO
+    callback_video_end(self->num);
+#endif /* VIDEO */
 
-    if (toxav_get_call_state(ASettins.av, self->call_idx) == av_CallInviting) {
-        error = toxav_cancel(ASettins.av, self->call_idx, self->num,
-                                        "Only those who appreciate small things know the beauty that is life");
-#ifdef SOUND_NOTIFY
-        stop_sound(self->ringing_sound);
-#endif
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Call canceled!");
-    } else {
-        error = toxav_hangup(ASettins.av, self->call_idx);
+    if ( CallControl.pending_call ) {
+        /* Manually send a cancel call control because call hasn't started */
+        toxav_call_control(CallControl.av, self->num, TOXAV_CALL_CONTROL_CANCEL, NULL);
+        callback_call_canceled(self->num);
+    }
+    else {
+        stop_transmission(&CallControl.calls[self->num], self->num);
+        callback_call_ended(self->num);
     }
 
-    if ( error != av_ErrorNone ) {
-        if ( error == av_ErrorInvalidState ) error_str = "Cannot hangup in invalid state!";
-        else if ( error == av_ErrorNoCall ) error_str = "No call!";
-        else error_str = "Internal error!";
-
-        goto on_error;
-    }
+    CallControl.pending_call = false;
 
     return;
 on_error:
@@ -596,28 +722,26 @@ void cmd_ccur_device(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*a
     }
 
     /* If call is active, change device */
-    if ( self->call_idx > -1) {
-        Call* this_call = &ASettins.calls[self->call_idx];
-        if (this_call->ttas) {
+    if ( self->is_call ) {
+        Call* this_call = &CallControl.calls[self->num];
+        if ( this_call->ttas ) {
 
-            ToxAvCSettings csettings;
-            toxav_get_peer_csettings(ASettins.av, self->call_idx, 0, &csettings);
 
-            if (type == output) {
+            if ( type == output ) {
                 pthread_mutex_lock(&this_call->mutex);
                 close_device(output, this_call->out_idx);
                 this_call->has_output = open_device(output, selection, &this_call->out_idx,
-                    csettings.audio_sample_rate, csettings.audio_frame_duration, csettings.audio_channels)
+                    CallControl.audio_sample_rate, CallControl.audio_frame_duration, CallControl.audio_channels)
                     == de_None ? 1 : 0;
                 pthread_mutex_unlock(&this_call->mutex);
             }
             else {
                 /* TODO: check for failure */
                 close_device(input, this_call->in_idx);
-                open_device(input, selection, &this_call->in_idx, csettings.audio_sample_rate,
-                    csettings.audio_frame_duration, csettings.audio_channels);
+                open_device(input, selection, &this_call->in_idx, CallControl.audio_sample_rate,
+                    CallControl.audio_frame_duration, CallControl.audio_channels);
                 /* Set VAD as true for all; TODO: Make it more dynamic */
-                register_device_callback(self->call_idx, this_call->in_idx, read_device_callback, &self->call_idx, true);
+                register_device_callback(self->num, this_call->in_idx, read_device_callback, &self->num, true);
             }
         }
     }
@@ -655,11 +779,11 @@ void cmd_mute(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
 
 
     /* If call is active, use this_call values */
-    if ( self->call_idx > -1) {
-        Call* this_call = &ASettins.calls[self->call_idx];
+    if ( self->is_call ) {
+        Call* this_call = &CallControl.calls[self->num];
 
         pthread_mutex_lock(&this_call->mutex);
-        if (type == input) {
+        if ( type == input ) {
             device_mute(type, this_call->in_idx);
             self->chatwin->infobox.in_is_muted ^= 1;
         } else {
@@ -695,8 +819,8 @@ void cmd_sense(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[M
     }
 
     /* Call must be active */
-    if ( self->call_idx > -1) {
-        device_set_VAD_treshold(ASettins.calls[self->call_idx].in_idx, value);
+    if ( self->is_call ) {
+        device_set_VAD_treshold(CallControl.calls[self->num].in_idx, value);
         self->chatwin->infobox.vad_lvl = value;
     }
 
@@ -709,23 +833,8 @@ on_error:
 
 void stop_current_call(ToxWindow* self)
 {
-    ToxAvCallState callstate;
-    if ( ASettins.av != NULL && self->call_idx != -1 &&
-       ( callstate = toxav_get_call_state(ASettins.av, self->call_idx) ) != av_CallNonExistent) {
-        switch (callstate)
-        {
-        case av_CallActive:
-        case av_CallHold:
-            toxav_hangup(ASettins.av, self->call_idx);
-            break;
-        case av_CallInviting:
-            toxav_cancel(ASettins.av, self->call_idx, 0, "Not interested anymore");
-            break;
-        case av_CallStarting:
-            toxav_reject(ASettins.av, self->call_idx, "Not interested");
-            break;
-        default:
-            break;
-        }
-    }
+    Call *this_call = &CallControl.calls[self->num];
+
+    if (this_call && self->is_call)
+        stop_transmission(this_call, self->num);
 }

src/audio_call.h

@@ -20,12 +20,14 @@
  *
  */
 
-#ifndef AUDIO_H
-#define AUDIO_H
+#ifndef AUDIO_CALL_H
+#define AUDIO_CALL_H
 
 #include <tox/toxav.h>
 
-#include "device.h"
+#include "audio_device.h"
+
+#define MAX_CALLS 10
 
 typedef enum _AudioError {
     ae_None = 0,
@@ -34,18 +36,58 @@ typedef enum _AudioError {
     ae_StartingCoreAudio = 1 << 2
 } AudioError;
 
+#ifdef VIDEO
+typedef enum _VideoError {
+    ve_None = 0,
+    ve_StartingCaptureDevice = 1 << 0,
+    ve_StartingOutputDevice = 1 << 1,
+    ve_StartingCoreVideo = 1 << 2
+} VideoError;
+
+#endif /* VIDEO */
+
 typedef struct Call {
     pthread_t ttid; /* Transmission thread id */
     bool ttas, has_output; /* Transmission thread active status (0 - stopped, 1- running) */
-    uint32_t in_idx, out_idx;
+    uint32_t in_idx, out_idx; /* Audio Index */
+#ifdef VIDEO
+    uint32_t vin_idx, vout_idx; /* Video Index */
+#endif /* VIDEO */
     pthread_mutex_t mutex;
 } Call;
 
+struct CallControl {
+    AudioError audio_errors;
+#ifdef VIDEO
+    VideoError video_errors;
+#endif /* VIDEO */
+
+    ToxAV *av;
+    ToxWindow *prompt;
+
+    Call calls[MAX_CALLS];
+    uint32_t call_state;
+    bool pending_call;
+    bool audio_enabled;
+    bool video_enabled;
+
+    uint32_t audio_bit_rate;
+    int32_t audio_frame_duration;
+    uint32_t audio_sample_rate;
+    uint8_t audio_channels;
+
+    uint32_t video_bit_rate;
+    int32_t video_frame_duration;
+
+} CallControl;
+
+struct CallControl CallControl;
+
 /* You will have to pass pointer to first member of 'windows' declared in windows.c */
-ToxAv *init_audio(ToxWindow *self, Tox *tox);
+ToxAV *init_audio(ToxWindow *self, Tox *tox);
 void terminate_audio();
 int start_transmission(ToxWindow *self, Call *call);
-int stop_transmission(Call *call, int call_index);
+int stop_transmission(Call *call, uint32_t friend_number);
 void stop_current_call(ToxWindow *self);
 
-#endif /* AUDIO_H */
+#endif /* AUDIO_CALL_H */

src/audio_device.c

@@ -1,4 +1,4 @@
-/*  device.c
+/*  audio_device.c
  *
  *
  *  Copyright (C) 2014 Toxic All Rights Reserved.
@@ -20,7 +20,7 @@
  *
  */
 
-#include "device.h"
+#include "audio_device.h"
 
 #ifdef AUDIO
 #include "audio_call.h"
@@ -57,7 +57,7 @@ typedef struct Device {
     ALCcontext *ctx;                       /* Device context */
     DataHandleCallback cb;                 /* Use this to handle data from input device usually */
     void* cb_data;                         /* Data to be passed to callback */
-    int32_t call_idx;                      /* ToxAv call index */
+    int32_t friend_number;                      /* ToxAV friend number */
 
     uint32_t source, buffers[OPENAL_BUFS]; /* Playback source/buffers */
     uint32_t ref_count;
@@ -80,7 +80,7 @@ Device *running[2][MAX_DEVICES] = {{NULL}};     /* Running devices */
 uint32_t primary_device[2];          /* Primary device */
 
 #ifdef AUDIO
-static ToxAv* av = NULL;
+static ToxAV* av = NULL;
 #endif /* AUDIO */
 
 /* q_mutex */
@@ -95,7 +95,7 @@ bool thread_running = true,
 void* thread_poll(void*);
 /* Meet devices */
 #ifdef AUDIO
-DeviceError init_devices(ToxAv* av_)
+DeviceError init_devices(ToxAV* av_)
 #else
 DeviceError init_devices()
 #endif /* AUDIO */
@@ -342,7 +342,7 @@ DeviceError close_device(DeviceType type, uint32_t device_idx)
     return rc;
 }
 
-DeviceError register_device_callback( int32_t call_idx, uint32_t device_idx, DataHandleCallback callback, void* data, bool enable_VAD)
+DeviceError register_device_callback( int32_t friend_number, uint32_t device_idx, DataHandleCallback callback, void* data, bool enable_VAD)
 {
     if (size[input] <= device_idx || !running[input][device_idx] || running[input][device_idx]->dhndl == NULL)
         return de_InvalidSelection;
@@ -351,7 +351,7 @@ DeviceError register_device_callback( int32_t call_idx, uint32_t device_idx, Dat
     running[input][device_idx]->cb = callback;
     running[input][device_idx]->cb_data = data;
     running[input][device_idx]->enable_VAD = enable_VAD;
-    running[input][device_idx]->call_idx = call_idx;
+    running[input][device_idx]->friend_number = friend_number;
     unlock;
 
     return de_None;

src/audio_device.h

@@ -1,4 +1,4 @@
-/*  device.h
+/*  audio_device.h
  *
  *
  *  Copyright (C) 2014 Toxic All Rights Reserved.
@@ -26,8 +26,8 @@
  * Read from running input device(s) via select()/callback combo.
  */
 
-#ifndef DEVICE_H
-#define DEVICE_H
+#ifndef AUDIO_DEVICE_H
+#define AUDIO_DEVICE_H
 
 #define OPENAL_BUFS 5
 #define MAX_DEVICES 32
@@ -56,7 +56,7 @@ typedef void (*DataHandleCallback) (const int16_t*, uint32_t size, void* data);
 
 
 #ifdef AUDIO
-DeviceError init_devices(ToxAv* av);
+DeviceError init_devices(ToxAV* av);
 #else
 DeviceError init_devices();
 #endif /* AUDIO */
@@ -64,7 +64,7 @@ DeviceError init_devices();
 DeviceError terminate_devices();
 
 /* Callback handles ready data from INPUT device */
-DeviceError register_device_callback(int32_t call_idx, uint32_t device_idx, DataHandleCallback callback, void* data, bool enable_VAD);
+DeviceError register_device_callback(int32_t friend_number, uint32_t device_idx, DataHandleCallback callback, void* data, bool enable_VAD);
 void* get_device_callback_data(uint32_t device_idx);
 
 /* toggle device mute */
@@ -88,4 +88,4 @@ void print_devices(ToxWindow* self, DeviceType type);
 void get_primary_device_name(DeviceType type, char *buf, int size);
 
 DeviceError selection_valid(DeviceType type, int32_t selection);
-#endif /* DEVICE_H */
+#endif /* AUDIO_DEVICE_H */

src/autocomplete.c

@@ -114,7 +114,7 @@ int complete_line(ToxWindow *self, const void *list, int n_items, int size)
     tmp[ctx->pos] = '\0';
 
     const char *s = dir_search ? strchr(tmp, '\"') : strrchr(tmp, ' ');
-    char *sub = malloc(strlen(ubuf) + 1);
+    char *sub = calloc(1, strlen(ubuf) + 1);
 
     if (sub == NULL)
         exit_toxic_err("failed in complete_line", FATALERR_MEMORY);
@@ -142,14 +142,14 @@ int complete_line(ToxWindow *self, const void *list, int n_items, int size)
     }
 
     int s_len = strlen(sub);
-    const char *str;
     int n_matches = 0;
     char matches[n_items][MAX_STR_SIZE];
     int i = 0;
 
     /* put all list matches in matches array */
     for (i = 0; i < n_items; ++i) {
-        str = &L[i * size];
+        char str[MAX_CMDNAME_SIZE + 1];
+        snprintf(str, sizeof(str), "%s", &L[i * size]);
 
         if (strncasecmp(str, sub, s_len) == 0)
             strcpy(matches[n_matches++], str);
@@ -165,10 +165,11 @@ int complete_line(ToxWindow *self, const void *list, int n_items, int size)
 
     char match[MAX_STR_SIZE];
     get_str_match(self, match, matches, n_matches);
+    size_t match_len = strlen(match);
 
     if (dir_search) {
         if (n_matches == 1)
-            endchrs = char_rfind(match, '.', strlen(match)) ? "\"" : "/";
+            endchrs = char_rfind(match, '.', match_len) ? "\"" : "/";
         else
             endchrs = "";
     } else if (n_matches > 1) {
@@ -177,18 +178,21 @@ int complete_line(ToxWindow *self, const void *list, int n_items, int size)
 
     /* put match in correct spot in buf and append endchars */
     int n_endchrs = strlen(endchrs);
-    int m_len = strlen(match);
     int strt = ctx->pos - s_len;
-    int diff = m_len - s_len + n_endchrs;
+    int diff = match_len - s_len + n_endchrs;
 
     if (ctx->len + diff >= MAX_STR_SIZE)
         return -1;
 
     char tmpend[MAX_STR_SIZE];
     snprintf(tmpend, sizeof(tmpend), "%s", &ubuf[ctx->pos]);
+
+    if (match_len + n_endchrs + strlen(tmpend) >= sizeof(ubuf))
+        return -1;
+
     strcpy(&ubuf[strt], match);
-    strcpy(&ubuf[strt + m_len], endchrs);
-    strcpy(&ubuf[strt + m_len + n_endchrs], tmpend);
+    strcpy(&ubuf[strt + match_len], endchrs);
+    strcpy(&ubuf[strt + match_len + n_endchrs], tmpend);
 
     /* convert to widechar and copy back to original buf */
     wchar_t newbuf[MAX_STR_SIZE];

src/chat.c

@@ -49,6 +49,9 @@
 
 #ifdef AUDIO
     #include "audio_call.h"
+#ifdef VIDEO
+    #include "video_call.h"
+#endif  /* VIDEO */
 #endif  /* AUDIO */
 
 extern char *DATA_FILE;
@@ -63,9 +66,9 @@ static void kill_infobox(ToxWindow *self);
 #endif  /* AUDIO */
 
 #ifdef AUDIO
-#define AC_NUM_CHAT_COMMANDS 27
+#define AC_NUM_CHAT_COMMANDS 30
 #else
-#define AC_NUM_CHAT_COMMANDS 20
+#define AC_NUM_CHAT_COMMANDS 22
 #endif /* AUDIO */
 
 /* Array of chat command names used for tab completion. */
@@ -84,8 +87,10 @@ static const char chat_cmd_list[AC_NUM_CHAT_COMMANDS][MAX_CMDNAME_SIZE] = {
     { "/join"       },
     { "/log"        },
     { "/myid"       },
+    { "/myqr"       },
     { "/nick"       },
     { "/note"       },
+    { "/nospam"     },
     { "/quit"       },
     { "/savefile"   },
     { "/sendfile"   },
@@ -100,6 +105,7 @@ static const char chat_cmd_list[AC_NUM_CHAT_COMMANDS][MAX_CMDNAME_SIZE] = {
     { "/sdev"       },
     { "/mute"       },
     { "/sense"      },
+    { "/video"      },
 
 #endif /* AUDIO */
 };
@@ -126,8 +132,11 @@ void kill_chat_window(ToxWindow *self, Tox *m)
     cqueue_cleanup(ctx->cqueue);
 
 #ifdef AUDIO
+#ifdef VIDEO
+    stop_video_stream(self);
+#endif  /* VIDEO */
     stop_current_call(self);
-#endif
+#endif  /* AUDIO */
 
     delwin(ctx->linewin);
     delwin(ctx->history);
@@ -623,32 +632,31 @@ static void chat_onGroupInvite(ToxWindow *self, Tox *m, int32_t friendnumber, ui
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Type \"/join\" to join the chat.");
 }
 
-/* Av Stuff */
+/* AV Stuff */
 #ifdef AUDIO
 
-void chat_onInvite (ToxWindow *self, ToxAv *av, int call_index)
+void chat_onInvite (ToxWindow *self, ToxAV *av, uint32_t friend_number, int state)
 {
-    if (!self || self->num != toxav_get_peer_id(av, call_index, 0))
+    if (!self || self->num != friend_number)
         return;
 
-    /* call_index is set here and reset on call end */
+    /* call is flagged active here */
+    self->is_call = true;
 
-    self->call_idx = call_index;
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Incoming audio call! Type: \"/answer\" or \"/reject\"");
 
     if (self->ringing_sound == -1)
         sound_notify(self, call_incoming, NT_LOOP, &self->ringing_sound);
 
-
     if (self->active_box != -1)
         box_silent_notify2(self, NT_NOFOCUS | NT_WNDALERT_0, self->active_box, "Incoming audio call!");
     else
         box_silent_notify(self, NT_NOFOCUS | NT_WNDALERT_0, &self->active_box, self->name, "Incoming audio call!");
 }
 
-void chat_onRinging (ToxWindow *self, ToxAv *av, int call_index)
+void chat_onRinging (ToxWindow *self, ToxAV *av, uint32_t friend_number, int state)
 {
-    if ( !self || self->call_idx != call_index || self->num != toxav_get_peer_id(av, call_index, 0))
+    if (!self || self->num != friend_number)
         return;
 
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Ringing...type \"/hangup\" to cancel it.");
@@ -659,40 +667,44 @@ void chat_onRinging (ToxWindow *self, ToxAv *av, int call_index)
 #endif /* SOUND_NOTIFY */
 }
 
-void chat_onStarting (ToxWindow *self, ToxAv *av, int call_index)
+void chat_onStarting (ToxWindow *self, ToxAV *av, uint32_t friend_number, int state)
 {
-    if ( !self || self->call_idx != call_index || self->num != toxav_get_peer_id(av, call_index, 0))
+    if (!self || self->num != friend_number)
         return;
 
     init_infobox(self);
 
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Call started! Type: \"/hangup\" to end it.");
 
+    /* call is flagged active here */
+    self->is_call = true;
+
 #ifdef SOUND_NOTIFY
     stop_sound(self->ringing_sound);
 #endif /* SOUND_NOTIFY */
 }
 
-void chat_onEnding (ToxWindow *self, ToxAv *av, int call_index)
+void chat_onEnding (ToxWindow *self, ToxAV *av, uint32_t friend_number, int state)
 {
-    if (!self || self->call_idx != call_index || self->num != toxav_get_peer_id(av, call_index, 0))
+    if (!self || self->num != friend_number)
         return;
 
     kill_infobox(self);
-    self->call_idx = -1;
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Call ended!");
 
+    self->is_call = false;
+
 #ifdef SOUND_NOTIFY
     stop_sound(self->ringing_sound);
 #endif /* SOUND_NOTIFY */
 }
 
-void chat_onError (ToxWindow *self, ToxAv *av, int call_index)
+void chat_onError (ToxWindow *self, ToxAV *av, uint32_t friend_number, int state)
 {
-    if (!self || self->call_idx != call_index || self->num != toxav_get_peer_id(av, call_index, 0))
+    if (!self || self->num != friend_number)
         return;
 
-    self->call_idx = -1;
+    self->is_call = false;
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Error!");
 
 #ifdef SOUND_NOTIFY
@@ -700,11 +712,14 @@ void chat_onError (ToxWindow *self, ToxAv *av, int call_index)
 #endif /* SOUND_NOTIFY */
 }
 
-void chat_onStart (ToxWindow *self, ToxAv *av, int call_index)
+void chat_onStart (ToxWindow *self, ToxAV *av, uint32_t friend_number, int state)
 {
-    if ( !self || self->call_idx != call_index || self->num != toxav_get_peer_id(av, call_index, 0))
+    if (!self || self->num != friend_number)
         return;
 
+    /* call is flagged active here */
+    self->is_call = true;
+
     init_infobox(self);
 
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Call started! Type: \"/hangup\" to end it.");
@@ -714,13 +729,13 @@ void chat_onStart (ToxWindow *self, ToxAv *av, int call_index)
 #endif /* SOUND_NOTIFY */
 }
 
-void chat_onCancel (ToxWindow *self, ToxAv *av, int call_index)
+void chat_onCancel (ToxWindow *self, ToxAV *av, uint32_t friend_number, int state)
 {
-    if ( !self || self->call_idx != call_index || self->num != toxav_get_peer_id(av, call_index, 0))
+    if (!self || self->num != friend_number)
         return;
 
+    self->is_call = false;
     kill_infobox(self);
-    self->call_idx = -1;
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Call canceled!");
 
 #ifdef SOUND_NOTIFY
@@ -728,39 +743,39 @@ void chat_onCancel (ToxWindow *self, ToxAv *av, int call_index)
 #endif /* SOUND_NOTIFY */
 }
 
-void chat_onReject (ToxWindow *self, ToxAv *av, int call_index)
+void chat_onReject (ToxWindow *self, ToxAV *av, uint32_t friend_number, int state)
 {
-    if (!self || self->call_idx != call_index || self->num != toxav_get_peer_id(av, call_index, 0))
+    if (!self  || self->num != friend_number)
         return;
 
-    self->call_idx = -1;
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Rejected!");
+    self->is_call = false;
 
 #ifdef SOUND_NOTIFY
     stop_sound(self->ringing_sound);
 #endif /* SOUND_NOTIFY */
 }
 
-void chat_onEnd (ToxWindow *self, ToxAv *av, int call_index)
+void chat_onEnd (ToxWindow *self, ToxAV *av, uint32_t friend_number, int state)
 {
-    if (!self || self->call_idx != call_index || self->num != toxav_get_peer_id(av, call_index, 0))
+    if (!self || self->num != friend_number)
         return;
 
     kill_infobox(self);
-    self->call_idx = -1;
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Call ended!");
+    self->is_call = false;
 
 #ifdef SOUND_NOTIFY
     stop_sound(self->ringing_sound);
 #endif /* SOUND_NOTIFY */
 }
 
-void chat_onRequestTimeout (ToxWindow *self, ToxAv *av, int call_index)
+void chat_onRequestTimeout (ToxWindow *self, ToxAV *av, uint32_t friend_number, int state)
 {
-    if (!self || self->call_idx != call_index || self->num != toxav_get_peer_id(av, call_index, 0))
+    if (!self || self->num != friend_number)
         return;
 
-    self->call_idx = -1;
+    self->is_call = false;
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No answer!");
 
 #ifdef SOUND_NOTIFY
@@ -768,13 +783,13 @@ void chat_onRequestTimeout (ToxWindow *self, ToxAv *av, int call_index)
 #endif /* SOUND_NOTIFY */
 }
 
-void chat_onPeerTimeout (ToxWindow *self, ToxAv *av, int call_index)
+void chat_onPeerTimeout (ToxWindow *self, ToxAV *av, uint32_t friend_number, int state)
 {
-    if (!self || self->call_idx != call_index || self->num != toxav_get_peer_id(av, call_index, 0))
+    if (!self || self->num != friend_number)
         return;
 
+    self->is_call = false;
     kill_infobox(self);
-    self->call_idx = -1;
     line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Peer disconnected; call ended!");
 
 #ifdef SOUND_NOTIFY
@@ -788,6 +803,10 @@ static void init_infobox(ToxWindow *self)
 
     int x2, y2;
     getmaxyx(self->window, y2, x2);
+
+    if (y2 <= 0 || x2 <= 0)
+        return;
+
     (void) y2;
 
     memset(&ctx->infobox, 0, sizeof(struct infobox));
@@ -894,7 +913,7 @@ static void chat_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
     getyx(self->window, y, x);
     getmaxyx(self->window, y2, x2);
 
-    if (x2 <= 0)
+    if (y2 <= 0 || x2 <= 0)
         return;
 
     if (self->help->active) {
@@ -992,6 +1011,9 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
     int x2, y2;
     getmaxyx(self->window, y2, x2);
 
+    if (y2 <= 0 || x2 <= 0)
+        return;
+
     ChatContext *ctx = self->chatwin;
 
     pthread_mutex_lock(&Winthread.lock);
@@ -1116,6 +1138,10 @@ static void chat_onInit(ToxWindow *self, Tox *m)
     curs_set(1);
     int x2, y2;
     getmaxyx(self->window, y2, x2);
+
+    if (y2 <= 0 || x2 <= 0)
+        exit_toxic_err("failed in chat_onInit", FATALERR_CURSES);
+
     self->x = x2;
 
     /* Init statusbar info */
@@ -1206,10 +1232,8 @@ ToxWindow new_chat(Tox *m, uint32_t friendnum)
     ret.onCancel = &chat_onCancel;
     ret.onReject = &chat_onReject;
     ret.onEnd = &chat_onEnd;
-    ret.onRequestTimeout = &chat_onRequestTimeout;
-    ret.onPeerTimeout = &chat_onPeerTimeout;
 
-    ret.call_idx = -1;
+    ret.is_call = false;
     ret.device_selection[0] = ret.device_selection[1] = -1;
     ret.ringing_sound = -1;
 #endif /* AUDIO */

src/chat_commands.c

@@ -45,9 +45,9 @@ void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*ar
 
     char msg[MAX_STR_SIZE];
     const char *inoutstr = argv[1];
-    int idx = atoi(argv[2]);
+    long int idx = strtol(argv[2], NULL, 10);
 
-    if (idx >= MAX_FILES || idx < 0) {
+    if ((idx == 0 && strcmp(argv[2], "0")) || idx >= MAX_FILES || idx < 0) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
         return;
     }
@@ -85,9 +85,9 @@ void cmd_groupinvite(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*a
         return;
     }
 
-    int groupnum = atoi(argv[1]);
+    long int groupnum = strtol(argv[1], NULL, 10);
 
-    if (groupnum == 0 && strcmp(argv[1], "0")) {    /* atoi returns 0 value on invalid input */
+    if ((groupnum == 0 && strcmp(argv[1], "0")) || groupnum < 0 || groupnum == LONG_MAX) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid group number.");
         return;
     }
@@ -120,11 +120,11 @@ void cmd_join_group(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*ar
 
     if (type == TOX_GROUPCHAT_TYPE_TEXT)
         groupnum = tox_join_groupchat(m, self->num, (uint8_t *) groupkey, length);
-#ifdef AUDIO
+/*#ifdef AUDIO
     else
         groupnum = toxav_join_av_groupchat(m, self->num, (uint8_t *) groupkey, length,
                                            NULL, NULL);
-#endif
+#endif*/
 
     if (groupnum == -1) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Group chat instance failed to initialize.");
@@ -146,9 +146,9 @@ void cmd_savefile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
         return;
     }
 
-    int idx = atoi(argv[1]);
+    long int idx = strtol(argv[1], NULL, 10);
 
-    if ((idx == 0 && strcmp(argv[1], "0")) || idx >= MAX_FILES) {
+    if ((idx == 0 && strcmp(argv[1], "0")) || idx < 0 || idx >= MAX_FILES) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
         return;
     }

src/chat_commands.h

@@ -43,4 +43,9 @@ void cmd_mute(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]
 void cmd_sense(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 #endif /* AUDIO */
 
+#ifdef VIDEO
+void cmd_video(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_ccur_video_device(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+#endif /* VIDEO */
+
 #endif /* #define CHAT_COMMANDS_H */

src/configdir.c

@@ -31,6 +31,7 @@
 
 #include "toxic.h"
 #include "configdir.h"
+#include "misc_tools.h"
 
 /* get the user's home directory */
 void get_home_dir(char *home, int size)
@@ -69,8 +70,8 @@ char *get_user_config_dir(void)
     char home[NSS_BUFLEN_PASSWD] = {0};
     get_home_dir(home, sizeof(home));
 
-    char *user_config_dir;
-    size_t len;
+    char *user_config_dir = NULL;
+    size_t len = 0;
 
 # if defined(__APPLE__)
     len = strlen(home) + strlen("/Library/Application Support") + 1;
@@ -82,9 +83,9 @@ char *get_user_config_dir(void)
     snprintf(user_config_dir, len, "%s/Library/Application Support", home);
 # else /* __APPLE__ */
 
-    const char *tmp;
+    const char *tmp = getenv("XDG_CONFIG_HOME");
 
-    if (!(tmp = getenv("XDG_CONFIG_HOME"))) {
+    if (tmp == NULL) {
         len = strlen(home) + strlen("/.config") + 1;
         user_config_dir = malloc(len);
 
@@ -98,6 +99,11 @@ char *get_user_config_dir(void)
 
 # endif /* __APPLE__ */
 
+    if (!file_exists(user_config_dir)) {
+        free(user_config_dir);
+        return NULL;
+    }
+
     return user_config_dir;
 }
 

src/dns.c

@@ -1,432 +0,0 @@
-/*  dns.c
- *
- *
- *  Copyright (C) 2014 Toxic All Rights Reserved.
- *
- *  This file is part of Toxic.
- *
- *  Toxic 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.
- *
- *  Toxic 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 Toxic.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h> /* for u_char */
-#include <netinet/in.h>
-#include <resolv.h>
-
-#ifdef __APPLE__
-    #include <arpa/nameser_compat.h>
-#else
-    #include <arpa/nameser.h>
-#endif  /* ifdef __APPLE__ */
-
-#include <tox/toxdns.h>
-
-#include "toxic.h"
-#include "windows.h"
-#include "line_info.h"
-#include "dns.h"
-#include "global_commands.h"
-#include "misc_tools.h"
-#include "configdir.h"
-
-#define DNS3_KEY_SIZE 32
-#define MAX_DNS_REQST_SIZE 255
-#define TOX_DNS3_TXT_PREFIX "v=tox3;id="
-
-extern struct Winthread Winthread;
-extern struct dns3_servers dns3_servers;
-extern struct arg_opts arg_opts;
-
-#define NUM_DNS3_BACKUP_SERVERS 2
-
-/* Hardcoded backup in case domain list is not loaded */
-static struct dns3_server_backup {
-    const char *name;
-    char key[DNS3_KEY_SIZE];
-} dns3_servers_backup[] = {
-    {
-        "utox.org",
-        {
-          0xD3, 0x15, 0x4F, 0x65, 0xD2, 0x8A, 0x5B, 0x41, 0xA0, 0x5D, 0x4A, 0xC7, 0xE4, 0xB3, 0x9C, 0x6B,
-          0x1C, 0x23, 0x3C, 0xC8, 0x57, 0xFB, 0x36, 0x5C, 0x56, 0xE8, 0x39, 0x27, 0x37, 0x46, 0x2A, 0x12
-        }
-    },
-    {
-        "toxme.se",
-        {
-          0x5D, 0x72, 0xC5, 0x17, 0xDF, 0x6A, 0xEC, 0x54, 0xF1, 0xE9, 0x77, 0xA6, 0xB6, 0xF2, 0x59, 0x14,
-          0xEA, 0x4C, 0xF7, 0x27, 0x7A, 0x85, 0x02, 0x7C, 0xD9, 0xF5, 0x19, 0x6D, 0xF1, 0x7E, 0x0B, 0x13
-        }
-    },
-};
-
-static struct thread_data {
-    ToxWindow *self;
-    char id_bin[TOX_ADDRESS_SIZE];
-    char addr[MAX_STR_SIZE];
-    char msg[MAX_STR_SIZE];
-    uint8_t busy;
-    Tox *m;
-} t_data;
-
-static struct dns_thread {
-    pthread_t tid;
-    pthread_attr_t attr;
-} dns_thread;
-
-
-#define MAX_DNS_SERVERS 50
-#define MAX_DOMAIN_SIZE 32
-#define MAX_DNS_LINE MAX_DOMAIN_SIZE + (DNS3_KEY_SIZE * 2) + 3
-
-struct dns3_servers {
-    bool loaded;
-    int lines;
-    char names[MAX_DNS_SERVERS][MAX_DOMAIN_SIZE];
-    char keys[MAX_DNS_SERVERS][DNS3_KEY_SIZE];
-} dns3_servers;
-
-static int load_dns_domainlist(const char *path)
-{
-    FILE *fp = fopen(path, "r");
-
-    if (fp == NULL)
-        return -1;
-
-    char line[MAX_DNS_LINE];
-
-    while (fgets(line, sizeof(line), fp) && dns3_servers.lines < MAX_DNS_SERVERS) {
-        int linelen = strlen(line);
-
-        if (linelen < DNS3_KEY_SIZE * 2 + 5)
-            continue;
-
-        if (line[linelen - 1] == '\n')
-            line[--linelen] = '\0';
-
-        const char *name = strtok(line, " ");
-        const char *keystr = strtok(NULL, " ");
-
-        if (name == NULL || keystr == NULL)
-            continue;
-
-        if (strlen(keystr) != DNS3_KEY_SIZE * 2)
-            continue;
-
-        snprintf(dns3_servers.names[dns3_servers.lines], sizeof(dns3_servers.names[dns3_servers.lines]), "%s", name);
-        int res = hex_string_to_bytes(dns3_servers.keys[dns3_servers.lines], DNS3_KEY_SIZE, keystr);
-
-        if (res == -1)
-            continue;
-
-        ++dns3_servers.lines;
-    }
-
-    fclose(fp);
-
-    if (dns3_servers.lines < 1)
-        return -2;
-
-    return 0;
-}
-
-static int dns_error(ToxWindow *self, const char *errmsg)
-{
-    pthread_mutex_lock(&Winthread.lock);
-    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "User lookup failed: %s", errmsg);
-    pthread_mutex_unlock(&Winthread.lock);
-
-    return -1;
-}
-
-static void killdns_thread(void *dns_obj)
-{
-    if (dns_obj)
-        tox_dns3_kill(dns_obj);
-
-    memset(&t_data, 0, sizeof(struct thread_data));
-    pthread_attr_destroy(&dns_thread.attr);
-    pthread_exit(NULL);
-}
-
-/* puts TXT from dns response in buf. Returns length of TXT on success, -1 on fail.*/
-static int parse_dns_response(ToxWindow *self, u_char *answer, int ans_len, char *buf)
-{
-    uint8_t *ans_pt = answer + sizeof(HEADER);
-    uint8_t *ans_end = answer + ans_len;
-    char exp_ans[PACKETSZ];
-
-    int len = dn_expand(answer, ans_end, ans_pt, exp_ans, sizeof(exp_ans));
-
-    if (len == -1)
-        return dns_error(self, "dn_expand failed.");
-
-    ans_pt += len;
-
-    if (ans_pt > ans_end - 4)
-         return dns_error(self, "DNS reply was too short.");
-
-    int type;
-    GETSHORT(type, ans_pt);
-
-    if (type != T_TXT)
-        return dns_error(self, "Broken DNS reply.");
-
-
-    ans_pt += INT16SZ;    /* class */
-    uint32_t size = 0;
-
-    /* recurse through CNAME rr's */
-    do {
-        ans_pt += size;
-        len = dn_expand(answer, ans_end, ans_pt, exp_ans, sizeof(exp_ans));
-
-        if (len == -1)
-            return dns_error(self, "Second dn_expand failed.");
-
-        ans_pt += len;
-
-        if (ans_pt > ans_end - 10)
-            return dns_error(self, "DNS reply was too short.");
-
-        GETSHORT(type, ans_pt);
-        ans_pt += INT16SZ;
-        ans_pt += 4;
-        GETSHORT(size, ans_pt);
-
-        if (ans_pt + size < answer || ans_pt + size > ans_end)
-            return dns_error(self, "RR overflow.");
-
-    } while (type == T_CNAME);
-
-    if (type != T_TXT)
-        return dns_error(self, "DNS response failed.");
-
-    uint32_t txt_len = *ans_pt;
-
-    if (!size || txt_len >= size || !txt_len)
-        return dns_error(self, "No record found.");
-
-    if (txt_len > MAX_DNS_REQST_SIZE)
-        return dns_error(self, "Invalid DNS response.");
-
-    ans_pt++;
-    ans_pt[txt_len] = '\0';
-    memcpy(buf, ans_pt, txt_len + 1);
-
-    return txt_len;
-}
-
-/* Takes address addr in the form "username@domain", puts the username in namebuf,
-   and the domain in dombuf.
-
-   return length of username on success, -1 on failure */
-static int parse_addr(const char *addr, char *namebuf, size_t namebuf_sz, char *dombuf, size_t dombuf_sz)
-{
-    if (strlen(addr) >= MAX_STR_SIZE)
-        return -1;
-
-    char tmpaddr[MAX_STR_SIZE];
-    char *tmpname = NULL;
-    char *tmpdom = NULL;
-
-    snprintf(tmpaddr, sizeof(tmpaddr), "%s", addr);
-    tmpname = strtok(tmpaddr, "@");
-    tmpdom = strtok(NULL, "");
-
-    if (tmpname == NULL || tmpdom == NULL)
-        return -1;
-
-    str_to_lower(tmpdom);
-    snprintf(namebuf, namebuf_sz, "%s", tmpname);
-    snprintf(dombuf, dombuf_sz, "%s", tmpdom);
-
-    return strlen(namebuf);
-}
-
-/* matches input domain name with domains in list and obtains key. Return 0 on success, -1 on failure */
-static int get_domain_match(char *pubkey, char *domain, const char *inputdomain)
-{
-    /* check server list first */
-    int i;
-    bool match = false;
-
-    for (i = 0; i < dns3_servers.lines; ++i) {
-        if (strcmp(dns3_servers.names[i], inputdomain) == 0) {
-            memcpy(pubkey, dns3_servers.keys[i], DNS3_KEY_SIZE);
-            snprintf(domain, MAX_DOMAIN_SIZE, "%s", dns3_servers.names[i]);
-            match = true;
-            break;
-        }
-    }
-
-    /* fall back to hard-coded domains on server list failure */
-    if (!match) {
-        for (i = 0; i < NUM_DNS3_BACKUP_SERVERS; ++i) {
-            if (strcmp(dns3_servers_backup[i].name, inputdomain) == 0) {
-                memcpy(pubkey, dns3_servers_backup[i].key, DNS3_KEY_SIZE);
-                snprintf(domain, MAX_DOMAIN_SIZE, "%s", dns3_servers_backup[i].name);
-                match = true;
-                break;
-            }
-        }
-
-        if (!match)
-            return -1;
-    }
-
-    return 0;
-}
-
-/* Does DNS lookup for addr and puts resulting tox id in id_bin. */
-void *dns3_lookup_thread(void *data)
-{
-    ToxWindow *self = t_data.self;
-
-    char inputdomain[MAX_STR_SIZE];
-    char name[MAX_STR_SIZE];
-
-    int namelen = parse_addr(t_data.addr, name, sizeof(name), inputdomain, sizeof(inputdomain));
-
-    if (namelen == -1) {
-        dns_error(self, "Must be a Tox ID or an address in the form username@domain");
-        killdns_thread(NULL);
-    }
-
-    char DNS_pubkey[DNS3_KEY_SIZE];
-    char domain[MAX_DOMAIN_SIZE];
-
-    int match = get_domain_match(DNS_pubkey, domain, inputdomain);
-
-    if (match == -1) {
-        dns_error(self, "Domain not found.");
-        killdns_thread(NULL);
-    }
-
-    void *dns_obj = tox_dns3_new((uint8_t *) DNS_pubkey);
-
-    if (dns_obj == NULL) {
-        dns_error(self, "Core failed to create DNS object.");
-        killdns_thread(NULL);
-    }
-
-    char string[MAX_DNS_REQST_SIZE + 1];
-    uint32_t request_id;
-
-    int str_len = tox_generate_dns3_string(dns_obj, (uint8_t *) string, sizeof(string), &request_id,
-                                           (uint8_t *) name, namelen);
-
-    if (str_len == -1) {
-        dns_error(self, "Core failed to generate DNS3 string.");
-        killdns_thread(dns_obj);
-    }
-
-    string[str_len] = '\0';
-
-    u_char answer[PACKETSZ];
-    char d_string[MAX_DOMAIN_SIZE + MAX_DNS_REQST_SIZE + 10];
-
-    /* format string and create dns query */
-    snprintf(d_string, sizeof(d_string), "_%s._tox.%s", string, domain);
-    int ans_len = res_query(d_string, C_IN, T_TXT, answer, sizeof(answer));
-
-    if (ans_len <= 0) {
-        dns_error(self, "DNS query failed.");
-        killdns_thread(dns_obj);
-    }
-
-    char ans_id[MAX_DNS_REQST_SIZE + 1];
-
-    /* extract TXT from DNS response */
-    if (parse_dns_response(self, answer, ans_len, ans_id) == -1)
-        killdns_thread(dns_obj);
-
-    char encrypted_id[MAX_DNS_REQST_SIZE + 1];
-    int prfx_len = strlen(TOX_DNS3_TXT_PREFIX);
-
-    /* extract the encrypted ID from TXT response */
-    if (strncmp(ans_id, TOX_DNS3_TXT_PREFIX, prfx_len) != 0) {
-        dns_error(self, "Bad DNS3 TXT response.");
-        killdns_thread(dns_obj);
-    }
-
-    memcpy(encrypted_id, ans_id + prfx_len, ans_len - prfx_len);
-
-    if (tox_decrypt_dns3_TXT(dns_obj, (uint8_t *) t_data.id_bin, (uint8_t *) encrypted_id,
-                             strlen(encrypted_id), request_id) == -1) {
-        dns_error(self, "Core failed to decrypt DNS response.");
-        killdns_thread(dns_obj);
-    }
-
-    pthread_mutex_lock(&Winthread.lock);
-    cmd_add_helper(self, t_data.m, t_data.id_bin, t_data.msg);
-    pthread_mutex_unlock(&Winthread.lock);
-
-    killdns_thread(dns_obj);
-    return 0;
-}
-
-/* creates new thread for dns3 lookup. Only allows one lookup at a time. */
-void dns3_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr, const char *msg)
-{
-    if (arg_opts.proxy_type != TOX_PROXY_TYPE_NONE && arg_opts.force_tcp) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "DNS lookups are disabled.");
-        return;
-    }
-
-    if (t_data.busy) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Please wait for previous user lookup to finish.");
-        return;
-    }
-
-    if (!dns3_servers.loaded) {
-        const char *path = arg_opts.dns_path[0] ? arg_opts.dns_path : PACKAGE_DATADIR "/DNSservers";
-        dns3_servers.loaded = true;
-        int ret = load_dns_domainlist(path);
-
-        if (ret < 0) {
-            const char *errmsg = "DNS server list failed to load with error code %d. Falling back to hard-coded list.";
-            line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, errmsg, ret);
-        }
-    }
-
-    snprintf(t_data.id_bin, sizeof(t_data.id_bin), "%s", id_bin);
-    snprintf(t_data.addr, sizeof(t_data.addr), "%s", addr);
-    snprintf(t_data.msg, sizeof(t_data.msg), "%s", msg);
-    t_data.self = self;
-    t_data.m = m;
-    t_data.busy = 1;
-
-    if (pthread_attr_init(&dns_thread.attr) != 0) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, "Error: DNS thread attr failed to init");
-        memset(&t_data, 0, sizeof(struct thread_data));
-        return;
-    }
-
-    if (pthread_attr_setdetachstate(&dns_thread.attr, PTHREAD_CREATE_DETACHED) != 0) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, "Error: DNS thread attr failed to set");
-        pthread_attr_destroy(&dns_thread.attr);
-        memset(&t_data, 0, sizeof(struct thread_data));
-        return;
-    }
-
-    if (pthread_create(&dns_thread.tid, &dns_thread.attr, dns3_lookup_thread, NULL) != 0) {
-        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, "Error: DNS thread failed to init");
-        pthread_attr_destroy(&dns_thread.attr);
-        memset(&t_data, 0, sizeof(struct thread_data));
-        return;
-    }
-}

src/execute.c

@@ -51,8 +51,10 @@ static struct cmd_func global_commands[] = {
     { "/help",      cmd_prompt_help   },
     { "/log",       cmd_log           },
     { "/myid",      cmd_myid          },
+    { "/myqr",      cmd_myqr          },
     { "/nick",      cmd_nick          },
     { "/note",      cmd_note          },
+    { "/nospam",    cmd_nospam        },
     { "/q",         cmd_quit          },
     { "/quit",      cmd_quit          },
     { "/requests",  cmd_requests      },
@@ -61,6 +63,10 @@ static struct cmd_func global_commands[] = {
     { "/lsdev",     cmd_list_devices  },
     { "/sdev",      cmd_change_device },
 #endif /* AUDIO */
+#ifdef VIDEO
+    { "/lsvdev",    cmd_list_video_devices },
+    { "/svdev" ,    cmd_change_video_device },
+#endif /* VIDEO */
     { NULL,         NULL              },
 };
 
@@ -78,6 +84,9 @@ static struct cmd_func chat_commands[] = {
     { "/mute",      cmd_mute        },
     { "/sense",     cmd_sense       },
 #endif /* AUDIO */
+#ifdef VIDEO
+    { "/video",     cmd_video       },
+#endif /* VIDEO */
     { NULL,         NULL            },
 };
 

src/friendlist.c

@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <arpa/inet.h>
+#include <assert.h>
 
 #include <tox/tox.h>
 
@@ -123,26 +124,26 @@ void kill_friendlist(void)
     realloc_friends(0);
 }
 
+/* Saves the blocklist to path. If there are no items in the blocklist the
+ * empty file will be removed.
+ *
+ * Returns 0 if stored successfully.
+ * Returns -1 on failure.
+ */
+#define TEMP_BLOCKLIST_EXT ".tmp"
 static int save_blocklist(char *path)
 {
     if (path == NULL)
         return -1;
 
     int len = sizeof(BlockedFriend) * Blocked.num_blocked;
-    char *data = malloc(len);
+    char data[len];
 
-    if (data == NULL)
-        exit_toxic_err("Failed in save_blocklist", FATALERR_MEMORY);
-
-    int i;
-
-    int count = 0;
+    int i, count = 0;
 
     for (i = 0; i < Blocked.max_idx; ++i) {
-        if (count > Blocked.num_blocked) {
-            free(data);
+        if (count > Blocked.num_blocked)
             return -1;
-        }
 
         if (Blocked.list[i].active) {
             BlockedFriend tmp;
@@ -161,21 +162,33 @@ static int save_blocklist(char *path)
         }
     }
 
-    FILE *fp = fopen(path, "wb");
-
-    if (fp == NULL) {
-        free(data);
+    /* Blocklist is empty, we can remove the empty file */
+    if (count == 0) {
+        if (remove(path) != 0)
             return -1;
+
+        return 0;
     }
 
+    char temp_path[strlen(path) + strlen(TEMP_BLOCKLIST_EXT) + 1];
+    snprintf(temp_path, sizeof(temp_path), "%s%s", path, TEMP_BLOCKLIST_EXT);
+
+    FILE *fp = fopen(temp_path, "wb");
+
+    if (fp == NULL)
+        return -1;
+
     if (fwrite(data, len, 1, fp) != 1) {
+        fprintf(stderr, "Failed to write blocklist data.\n");
         fclose(fp);
-        free(data);
         return -1;
     }
 
     fclose(fp);
-    free(data);
+
+    if (rename(temp_path, path) != 0)
+        return -1;
+
     return 0;
 }
 
@@ -198,22 +211,15 @@ int load_blocklist(char *path)
         return -1;
     }
 
-    char *data = malloc(len);
-
-    if (data == NULL) {
-        fclose(fp);
-        exit_toxic_err("Failed in load_blocklist", FATALERR_MEMORY);
-    }
+    char data[len];
 
     if (fread(data, len, 1, fp) != 1) {
         fclose(fp);
-        free(data);
         return -1;
     }
 
     if (len % sizeof(BlockedFriend) != 0) {
         fclose(fp);
-        free(data);
         return -1;
     }
 
@@ -231,7 +237,7 @@ int load_blocklist(char *path)
         memcpy(&tmp, data + i * sizeof(BlockedFriend), sizeof(BlockedFriend));
         Blocked.list[i].active = true;
         Blocked.list[i].num = i;
-        Blocked.list[i].namelength = ntohs(tmp.namelength);
+        Blocked.list[i].namelength = MIN(TOXIC_MAX_NAME_LENGTH, ntohs(tmp.namelength));
         memcpy(Blocked.list[i].name, tmp.name, Blocked.list[i].namelength + 1);
         memcpy(Blocked.list[i].pub_key, tmp.pub_key, TOX_PUBLIC_KEY_SIZE);
 
@@ -243,7 +249,6 @@ int load_blocklist(char *path)
         ++Blocked.num_blocked;
     }
 
-    free(data);
     fclose(fp);
     sort_blocklist_index();
 
@@ -704,7 +709,7 @@ static void unblock_friend(Tox *m, uint32_t bnum)
     uint32_t friendnum = tox_friend_add_norequest(m, (uint8_t *) Blocked.list[bnum].pub_key, &err);
 
     if (err != TOX_ERR_FRIEND_ADD_OK) {
-        line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to unblock friend (error %d)\n", err);
+        line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to unblock friend (error %d)", err);
         return;
     }
 
@@ -1089,23 +1094,24 @@ void disable_chatwin(uint32_t f_num)
 }
 
 #ifdef AUDIO
-static void friendlist_onAv(ToxWindow *self, ToxAv *av, int call_index)
+static void friendlist_onAV(ToxWindow *self, ToxAV *av, uint32_t friend_number, int state)
 {
-    int id = toxav_get_peer_id(av, call_index, 0);
-
-    if ( id != av_ErrorUnknown && id >= Friends.max_idx)
+    assert(0);
+    if( friend_number >= Friends.max_idx)
         return;
 
+    assert(0);
     Tox *m = toxav_get_tox(av);
 
-    if (Friends.list[id].chatwin == -1) {
+    if (Friends.list[friend_number].chatwin == -1) {
         if (get_num_active_windows() < MAX_WINDOWS_NUM) {
-            if (toxav_get_call_state(av, call_index) == av_CallStarting) { /* Only open windows when call is incoming */
-                Friends.list[id].chatwin = add_window(m, new_chat(m, Friends.list[id].num));
+            if(state != TOXAV_FRIEND_CALL_STATE_FINISHED) {
+                Friends.list[friend_number].chatwin = add_window(m, new_chat(m, Friends.list[friend_number].num));
+                set_active_window(Friends.list[friend_number].chatwin);
             }
         } else {
             char nick[TOX_MAX_NAME_LENGTH];
-            get_nick_truncate(m, nick, Friends.list[id].num);
+            get_nick_truncate(m, nick, Friends.list[friend_number].num);
             line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, "Audio action from: %s!", nick);
 
             const char *errmsg = "* Warning: Too many windows are open.";
@@ -1137,22 +1143,21 @@ ToxWindow new_friendlist(void)
     ret.onGroupInvite = &friendlist_onGroupInvite;
 
 #ifdef AUDIO
-    ret.onInvite = &friendlist_onAv;
-    ret.onRinging = &friendlist_onAv;
-    ret.onStarting = &friendlist_onAv;
-    ret.onEnding = &friendlist_onAv;
-    ret.onError = &friendlist_onAv;
-    ret.onStart = &friendlist_onAv;
-    ret.onCancel = &friendlist_onAv;
-    ret.onReject = &friendlist_onAv;
-    ret.onEnd = &friendlist_onAv;
-    ret.onRequestTimeout = &friendlist_onAv;
-    ret.onPeerTimeout = &friendlist_onAv;
+    ret.onInvite = &friendlist_onAV;
+    ret.onRinging = &friendlist_onAV;
+    ret.onStarting = &friendlist_onAV;
+    ret.onEnding = &friendlist_onAV;
+    ret.onError = &friendlist_onAV;
+    ret.onStart = &friendlist_onAV;
+    ret.onCancel = &friendlist_onAV;
+    ret.onReject = &friendlist_onAV;
+    ret.onEnd = &friendlist_onAV;
 
-    ret.call_idx = -1;
+    ret.is_call = false;
     ret.device_selection[0] = ret.device_selection[1] = -1;
 #endif /* AUDIO */
 
+    ret.num = -1;
     ret.active_box = -1;
 
     Help *help = calloc(1, sizeof(Help));

src/global_commands.c

@@ -22,7 +22,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <arpa/inet.h>
 
 #include "toxic.h"
 #include "windows.h"
@@ -30,12 +29,13 @@
 #include "friendlist.h"
 #include "log.h"
 #include "line_info.h"
-#include "dns.h"
 #include "groupchat.h"
 #include "prompt.h"
 #include "help.h"
 #include "term_mplex.h"
 #include "avatars.h"
+#include "name_lookup.h"
+#include "qr_code.h"
 
 extern char *DATA_FILE;
 extern ToxWindow *prompt;
@@ -50,9 +50,9 @@ void cmd_accept(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
         return;
     }
 
-    int req = atoi(argv[1]);
+    long int req = strtol(argv[1], NULL, 10);
 
-    if ((req == 0 && strcmp(argv[1], "0")) || req < 0 || req > MAX_FRIEND_REQUESTS) {
+    if ((req == 0 && strcmp(argv[1], "0")) || req < 0 || req >= MAX_FRIEND_REQUESTS) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No pending friend request with that ID.");
         return;
     }
@@ -192,8 +192,8 @@ void cmd_add(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
         }
 
         cmd_add_helper(self, m, id_bin, msg);
-    } else {    /* assume id is a username@domain address and do DNS lookup */
-        dns3_lookup(self, m, id_bin, id, msg);
+    } else {    /* assume id is a username@domain address and do http name server lookup */
+        name_lookup(self, m, id_bin, id, msg);
     }
 }
 
@@ -248,10 +248,12 @@ void cmd_connect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)
     }
 
     const char *ip = argv[1];
-    const char *port = argv[2];
+    const char *port_str = argv[2];
     const char *ascii_key = argv[3];
 
-    if (atoi(port) == 0) {
+    long int port = strtol(port_str, NULL, 10);
+
+    if (port <= 0 || port > MAX_PORT_RANGE) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid port.");
         return;
     }
@@ -263,8 +265,8 @@ void cmd_connect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)
     }
 
     TOX_ERR_BOOTSTRAP err;
-    tox_bootstrap(m, ip, atoi(port), (uint8_t *) key_binary, &err);
-    tox_add_tcp_relay(m, ip, atoi(port), (uint8_t *) key_binary, &err);
+    tox_bootstrap(m, ip, port, (uint8_t *) key_binary, &err);
+    tox_add_tcp_relay(m, ip, port, (uint8_t *) key_binary, &err);
 
     switch (err) {
         case TOX_ERR_BOOTSTRAP_BAD_HOST:
@@ -290,9 +292,9 @@ void cmd_decline(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)
         return;
     }
 
-    int req = atoi(argv[1]);
+    long int req = strtol(argv[1], NULL, 10);
 
-    if ((req == 0 && strcmp(argv[1], "0")) || req < 0 || req > MAX_FRIEND_REQUESTS) {
+    if ((req == 0 && strcmp(argv[1], "0")) || req < 0 || req >= MAX_FRIEND_REQUESTS) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No pending friend request with that ID.");
         return;
     }
@@ -342,10 +344,10 @@ void cmd_groupchat(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*arg
 
     if (type == TOX_GROUPCHAT_TYPE_TEXT)
         groupnum = tox_add_groupchat(m);
-#ifdef AUDIO
+/*#ifdef AUDIO
     else
         groupnum = toxav_add_av_groupchat(m, NULL, NULL);
-#endif
+#endif*/
 
     if (groupnum == -1) {
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Group chat instance failed to initialize.");
@@ -368,9 +370,9 @@ void cmd_log(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
 
     if (argc == 0) {
         if (log->log_on)
-            msg = "Logging for this window is ON. Type \"/log off\" to disable.";
+            msg = "Logging for this window is ON; type \"/log off\" to disable. (Logs are not encrypted)";
         else
-            msg = "Logging for this window is OFF. Type \"/log on\" to enable.";
+            msg = "Logging for this window is OFF; type \"/log on\" to enable.";
 
         line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, msg);
         return;
@@ -413,19 +415,57 @@ void cmd_log(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
 
 void cmd_myid(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
-    char id[TOX_ADDRESS_SIZE * 2 + 1] = {0};
-    char address[TOX_ADDRESS_SIZE];
-    tox_self_get_address(m, (uint8_t *) address);
+    char id_string[TOX_ADDRESS_SIZE * 2 + 1];
+    char bin_id[TOX_ADDRESS_SIZE];
+    tox_self_get_address(m, (uint8_t *) bin_id);
 
-    size_t i;
-
-    for (i = 0; i < TOX_ADDRESS_SIZE; ++i) {
-        char xx[3];
-        snprintf(xx, sizeof(xx), "%02X", address[i] & 0xff);
-        strcat(id, xx);
+    if (bin_id_to_string(bin_id, sizeof(bin_id), id_string, sizeof(id_string)) == -1) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to print ID.");
+        return;
     }
 
-    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", id);
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", id_string);
+}
+
+void cmd_myqr(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    char id_string[TOX_ADDRESS_SIZE * 2 + 1];
+    char bin_id[TOX_ADDRESS_SIZE];
+    tox_self_get_address(m, (uint8_t *) bin_id);
+
+    if (bin_id_to_string(bin_id, sizeof(bin_id), id_string, sizeof(id_string)) == -1) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to create QR code.");
+        return;
+    }
+
+    char nick[TOX_MAX_NAME_LENGTH];
+    tox_self_get_name(m, (uint8_t *) nick);
+    size_t nick_len = tox_self_get_name_size(m);
+    nick[nick_len] = '\0';
+
+    size_t data_file_len = strlen(DATA_FILE);
+    char dir[data_file_len + 1];
+    size_t dir_len = get_base_dir(DATA_FILE, data_file_len, dir);
+
+    char qr_path[dir_len + nick_len + strlen(QRCODE_FILENAME_EXT) + 1];
+    snprintf(qr_path, sizeof(qr_path), "%s%s%s", dir, nick, QRCODE_FILENAME_EXT);
+
+    FILE *output = fopen(qr_path, "wb");
+
+    if (output == NULL) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to create QR code.");
+        return;
+    }
+
+    if (ID_to_QRcode(id_string, output) == -1) {
+        fclose(output);
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to create QR code.");
+        return;
+    }
+
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "QR code has been printed to the file '%s'", qr_path);
+
+    fclose(output);
 }
 
 void cmd_nick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
@@ -482,6 +522,15 @@ void cmd_note(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
     prompt_update_statusmessage(prompt, m, msg);
 }
 
+void cmd_nospam(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    uint32_t nospam = rand();   /* should be random enough */
+    tox_self_set_nospam(m, nospam);
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Your Tox ID has been changed to:");
+    cmd_myid(window, self, m, 0, NULL);
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Any services that relied on your old ID will need to be updated manually.");
+}
+
 void cmd_prompt_help(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
     help_init_menu(self);

src/global_commands.h

@@ -35,8 +35,10 @@ void cmd_decline(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)
 void cmd_groupchat(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_log(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_myid(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_myqr(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_nick(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_note(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_nospam(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_prompt_help(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_quit(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_requests(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
@@ -49,4 +51,9 @@ void cmd_list_devices(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_S
 void cmd_change_device(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 #endif /* AUDIO */
 
+#ifdef VIDEO
+void cmd_list_video_devices(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_change_video_device(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+#endif /* VIDEO */
+
 #endif /* #define GLOBAL_COMMANDS_H */

src/groupchat.c

@@ -59,7 +59,7 @@
 #include "help.h"
 #include "notify.h"
 #include "autocomplete.h"
-#include "device.h"
+#include "audio_device.h"
 
 extern char *DATA_FILE;
 
@@ -70,9 +70,9 @@ extern struct user_settings *user_settings;
 extern struct Winthread Winthread;
 
 #ifdef AUDIO
-#define AC_NUM_GROUP_COMMANDS 22
+#define AC_NUM_GROUP_COMMANDS 24
 #else
-#define AC_NUM_GROUP_COMMANDS 18
+#define AC_NUM_GROUP_COMMANDS 20
 #endif /* AUDIO */
 
 /* Array of groupchat command names used for tab completion. */
@@ -89,8 +89,10 @@ static const char group_cmd_list[AC_NUM_GROUP_COMMANDS][MAX_CMDNAME_SIZE] = {
     { "/help"       },
     { "/log"        },
     { "/myid"       },
+    { "/myqr"       },
     { "/nick"       },
     { "/note"       },
+    { "/nospam"     },
     { "/quit"       },
     { "/requests"   },
     { "/status"     },
@@ -209,6 +211,9 @@ void redraw_groupchat_win(ToxWindow *self)
     getmaxyx(stdscr, y2, x2);
     y2 -= 2;
 
+    if (y2 <= 0 || x2 <= 0)
+        return;
+
     if (ctx->sidebar) {
         delwin(ctx->sidebar);
         ctx->sidebar = NULL;
@@ -558,7 +563,7 @@ static void groupchat_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
     getyx(self->window, y, x);
     getmaxyx(self->window, y2, x2);
 
-    if (x2 <= 0)
+    if (x2 <= 0 || y2 <= 0)
         return;
 
     if (self->help->active) {
@@ -648,6 +653,9 @@ static void groupchat_onDraw(ToxWindow *self, Tox *m)
     int x2, y2;
     getmaxyx(self->window, y2, x2);
 
+    if (x2 <= 0 || y2 <= 0)
+        return;
+
     ChatContext *ctx = self->chatwin;
 
     pthread_mutex_lock(&Winthread.lock);
@@ -712,6 +720,9 @@ static void groupchat_onInit(ToxWindow *self, Tox *m)
     int x2, y2;
     getmaxyx(self->window, y2, x2);
 
+    if (x2 <= 0 || y2 <= 0)
+        exit_toxic_err("failed in groupchat_onInit", FATALERR_CURSES);
+
     ChatContext *ctx = self->chatwin;
 
     ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT + 1, x2 - SIDEBAR_WIDTH - 1, 0, 0);
@@ -836,7 +847,7 @@ static int group_audio_close_out_device(int groupnum)
 //     return 0;
 // }
 
-static void groupchat_onWriteDevice(ToxWindow *self, Tox *m, int groupnum, int peernum, const int16_t *pcm,
+static void groupchat_onWriteDevice(ToxWindow *self, Tox *m, uint32_t groupnum, int peernum, const int16_t *pcm,
                                     unsigned int samples, uint8_t channels, unsigned int sample_rate)
 {
     return;

src/help.c

@@ -60,6 +60,9 @@ static void help_init_window(ToxWindow *self, int height, int width)
     int y2, x2;
     getmaxyx(stdscr, y2, x2);
 
+    if (y2 <= 0 || x2 <= 0)
+        return;
+
     height = MIN(height, y2);
     width = MIN(width, x2);
 
@@ -151,9 +154,11 @@ static void help_draw_global(ToxWindow *self)
     wprintw(win, "  /status <type> <msg>       : Set status with optional note\n");
     wprintw(win, "  /note <msg>                : Set a personal note\n");
     wprintw(win, "  /nick <nick>               : Set your nickname\n");
+    wprintw(win, "  /nospam                    : Change part of your Tox ID to stop spam\n");
     wprintw(win, "  /log <on> or <off>         : Enable/disable logging\n");
     wprintw(win, "  /group <type>              : Create a group chat where type: text | audio\n");
     wprintw(win, "  /myid                      : Print your Tox ID\n");
+    wprintw(win, "  /myqr                      : Print your Tox ID's QR code to a file.\n");
     wprintw(win, "  /clear                     : Clear window history\n");
     wprintw(win, "  /close                     : Close the current chat window\n");
     wprintw(win, "  /quit or /exit             : Exit Toxic\n");
@@ -167,6 +172,15 @@ static void help_draw_global(ToxWindow *self)
     wprintw(win, "  /sdev <type> <id>          : Set active device\n");
 #endif /* AUDIO */
 
+#ifdef VIDEO
+    wattron(win, A_BOLD);
+    wprintw(win, "\n Video:\n");
+    wattroff(win, A_BOLD);
+
+    wprintw(win, "  /lsvdev <type>             : List video devices where type: in|out\n");
+    wprintw(win, "  /svdev <type> <id>         : Set active video device\n");
+#endif /* VIDEO */
+
     help_draw_bottom_menu(win);
 
     box(win, ACS_VLINE, ACS_HLINE);
@@ -203,6 +217,13 @@ static void help_draw_chat(ToxWindow *self)
     wprintw(win, "  /sense <n>                 : VAD sensitivity threshold\n");
 #endif /* AUDIO */
 
+#ifdef VIDEO
+    wattron(win, A_BOLD);
+    wprintw(win, "\n Video:\n");
+    wattroff(win, A_BOLD);
+    wprintw(win, "  /video                     : Toggle video call\n");
+#endif /* VIDEO */
+
     help_draw_bottom_menu(win);
 
     box(win, ACS_VLINE, ACS_HLINE);
@@ -282,19 +303,23 @@ void help_onKey(ToxWindow *self, wint_t key)
             break;
 
         case 'c':
-#ifdef AUDIO
+#ifdef VIDEO
+            help_init_window(self, 22, 80);
+#elif AUDIO
             help_init_window(self, 19, 80);
 #else
-            help_init_window(self, 9, 80);
+            help_init_window(self, 10, 80);
 #endif
             self->help->type = HELP_CHAT;
             break;
 
         case 'g':
-#ifdef AUDIO
-            help_init_window(self, 24, 80);
+#ifdef VIDEO
+            help_init_window(self, 30, 80);
+#elif AUDIO
+            help_init_window(self, 26, 80);
 #else
-            help_init_window(self, 20, 80);
+            help_init_window(self, 22, 80);
 #endif
             self->help->type = HELP_GLOBAL;
             break;

src/misc_tools.c

@@ -149,6 +149,24 @@ int hex_string_to_bytes(char *buf, int size, const char *keystr)
     return 0;
 }
 
+/* Converts a binary representation of a Tox ID into a string.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int bin_id_to_string(const char *bin_id, size_t bin_id_size, char *output, size_t output_size)
+{
+    if (bin_id_size != TOX_ADDRESS_SIZE || output_size < (TOX_ADDRESS_SIZE * 2 + 1))
+        return -1;
+
+    size_t i;
+
+    for (i = 0; i < TOX_ADDRESS_SIZE; ++i)
+        snprintf(&output[i*2], output_size - (i * 2), "%02X", bin_id[i] & 0xff);
+
+    return 0;
+}
+
 /* Returns 1 if the string is empty, 0 otherwise */
 int string_is_empty(const char *string)
 {
@@ -263,6 +281,27 @@ size_t get_file_name(char *namebuf, size_t bufsize, const char *pathname)
     return strlen(namebuf);
 }
 
+/* Gets the base directory of path and puts it in dir.
+ * dir must have at least as much space as path_len + 1.
+ *
+ * Returns the length of the base directory.
+ */
+size_t get_base_dir(const char *path, size_t path_len, char *dir)
+{
+    if (path_len == 0 || path == NULL)
+        return 0;
+
+    size_t dir_len = char_rfind(path, '/', path_len);
+
+    if (dir_len != 0 && dir_len < path_len)
+        ++dir_len;  /* Leave trailing slash */
+
+    memcpy(dir, path, dir_len);
+    dir[dir_len] = '\0';
+
+    return dir_len;
+}
+
 /* converts str to all lowercase */
 void str_to_lower(char *str)
 {
@@ -332,8 +371,8 @@ int char_find(int idx, const char *s, char ch)
     return i;
 }
 
-/* returns index of the last instance of ch in s starting at len
-   returns 0 if char not found (skips 0th index) */
+/* returns index of the last instance of ch in s starting at len.
+   returns 0 if char not found (skips 0th index). */
 int char_rfind(const char *s, char ch, int len)
 {
     int i = 0;

src/misc_tools.h

@@ -53,6 +53,13 @@ int hex_string_to_bin(const char *hex_string, size_t hex_len, char *output, size
 /* convert a hex string to bytes. returns 0 on success, -1 on failure */
 int hex_string_to_bytes(char *buf, int size, const char *keystr);
 
+/* Converts a binary representation of a Tox ID into a string.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int bin_id_to_string(const char *bin_id, size_t bin_id_size, char *output, size_t output_size);
+
 /* get the current unix time (not thread safe) */
 uint64_t get_unix_time(void);
 
@@ -103,6 +110,14 @@ void filter_str(char *str, size_t len);
 /* gets base file name from path or original file name if no path is supplied */
 size_t get_file_name(char *namebuf, size_t bufsize, const char *pathname);
 
+/* Gets the base directory of path and puts it in dir.
+ * dir must have at least as much space as path_len.
+ *
+ * Returns the length of the base directory on success.
+ * Returns -1 on failure.
+ */
+size_t get_base_dir(const char *path, size_t path_len, char *dir);
+
 /* converts str to all lowercase */
 void str_to_lower(char *str);
 

src/name_lookup.c

@@ -0,0 +1,461 @@
+/*  name_lookup.c
+ *
+ *
+ *  Copyright (C) 2015 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic 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.
+ *
+ *  Toxic 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 Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h> /* for u_char */
+#include <curl/curl.h>
+
+#include "toxic.h"
+#include "windows.h"
+#include "line_info.h"
+#include "global_commands.h"
+#include "misc_tools.h"
+#include "configdir.h"
+
+extern struct arg_opts arg_opts;
+extern struct Winthread Winthread;;
+
+#define NAMESERVER_API_PATH "api"
+#define SERVER_KEY_SIZE 32
+#define MAX_SERVERS 50
+#define MAX_DOMAIN_SIZE 32
+#define MAX_SERVER_LINE MAX_DOMAIN_SIZE + (SERVER_KEY_SIZE * 2) + 3
+
+/* List based on Mozilla's recommended configurations for modern browsers */
+#define TLS_CIPHER_SUITE_LIST "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK"
+
+struct Nameservers {
+    int     lines;
+    char    names[MAX_SERVERS][MAX_DOMAIN_SIZE];
+    char    keys[MAX_SERVERS][SERVER_KEY_SIZE];
+} Nameservers;
+
+static struct thread_data {
+    Tox       *m;
+    ToxWindow *self;
+    char    id_bin[TOX_ADDRESS_SIZE];
+    char    addr[MAX_STR_SIZE];
+    char    msg[MAX_STR_SIZE];
+    bool    busy;
+    bool    disabled;
+} t_data;
+
+static struct lookup_thread {
+    pthread_t tid;
+    pthread_attr_t attr;
+} lookup_thread;
+
+static int lookup_error(ToxWindow *self, const char *errmsg, ...)
+{
+    char frmt_msg[MAX_STR_SIZE];
+
+    va_list args;
+    va_start(args, errmsg);
+    vsnprintf(frmt_msg, sizeof(frmt_msg), errmsg, args);
+    va_end(args);
+
+    pthread_mutex_lock(&Winthread.lock);
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "name lookup failed: %s", frmt_msg);
+    pthread_mutex_unlock(&Winthread.lock);
+
+    return -1;
+}
+
+static void kill_lookup_thread(void)
+{
+    memset(&t_data, 0, sizeof(struct thread_data));
+    pthread_attr_destroy(&lookup_thread.attr);
+    pthread_exit(NULL);
+}
+
+/* Attempts to load the nameserver list pointed at by path into the Nameservers structure.
+ *
+ * Returns 0 on success.
+ * -1 is reserved.
+ * Returns -2 if the supplied path does not exist.
+ * Returns -3 if the list does not contain any valid entries.
+ */
+static int load_nameserver_list(const char *path)
+{
+    FILE *fp = fopen(path, "r");
+
+    if (fp == NULL)
+        return -2;
+
+    char line[MAX_SERVER_LINE];
+
+    while (fgets(line, sizeof(line), fp) && Nameservers.lines < MAX_SERVERS) {
+        int linelen = strlen(line);
+
+        if (linelen < SERVER_KEY_SIZE * 2 + 5)
+            continue;
+
+        if (line[linelen - 1] == '\n')
+            line[--linelen] = '\0';
+
+        const char *name = strtok(line, " ");
+        const char *keystr = strtok(NULL, " ");
+
+        if (name == NULL || keystr == NULL)
+            continue;
+
+        if (strlen(keystr) != SERVER_KEY_SIZE * 2)
+            continue;
+
+        snprintf(Nameservers.names[Nameservers.lines], sizeof(Nameservers.names[Nameservers.lines]), "%s", name);
+        int res = hex_string_to_bytes(Nameservers.keys[Nameservers.lines], SERVER_KEY_SIZE, keystr);
+
+        if (res == -1)
+            continue;
+
+        ++Nameservers.lines;
+    }
+
+    fclose(fp);
+
+    if (Nameservers.lines < 1)
+        return -3;
+
+    return 0;
+}
+
+/* Takes address addr in the form "username@domain", puts the username in namebuf,
+ * and the domain in dombuf.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure
+ */
+static int parse_addr(const char *addr, char *namebuf, size_t namebuf_sz, char *dombuf, size_t dombuf_sz)
+{
+    if (strlen(addr) >= (MAX_STR_SIZE - strlen(NAMESERVER_API_PATH)))
+        return -1;
+
+    char tmpaddr[MAX_STR_SIZE];
+    char *tmpname = NULL;
+    char *tmpdom = NULL;
+
+    snprintf(tmpaddr, sizeof(tmpaddr), "%s", addr);
+    tmpname = strtok(tmpaddr, "@");
+    tmpdom = strtok(NULL, "");
+
+    if (tmpname == NULL || tmpdom == NULL)
+        return -1;
+
+    str_to_lower(tmpdom);
+    snprintf(namebuf, namebuf_sz, "%s", tmpname);
+    snprintf(dombuf, dombuf_sz, "%s", tmpdom);
+
+    return 0;
+}
+
+/* matches input domain name with domains in list and obtains key.
+ * Turns out_domain into the full domain we need to make a POST request.
+ *
+ * Return true on match.
+ * Returns false on no match.
+ */
+static bool get_domain_match(char *pubkey, char *out_domain, size_t out_domain_size, const char *inputdomain)
+{
+    int i;
+
+    for (i = 0; i < Nameservers.lines; ++i) {
+        if (strcmp(Nameservers.names[i], inputdomain) == 0) {
+            memcpy(pubkey, Nameservers.keys[i], SERVER_KEY_SIZE);
+            snprintf(out_domain, out_domain_size, "https://%s/%s", Nameservers.names[i], NAMESERVER_API_PATH);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+#define MAX_RECV_LOOKUP_DATA_SIZE 1024
+
+/* Holds raw data received from name server */
+struct Recv_Data {
+    char data[MAX_RECV_LOOKUP_DATA_SIZE];
+    size_t size;
+};
+
+size_t write_lookup_data(void *data, size_t size, size_t nmemb, void *user_pointer)
+{
+    struct Recv_Data *recv_data = (struct Recv_Data *) user_pointer;
+    size_t real_size = size * nmemb;
+
+    if (real_size >= MAX_RECV_LOOKUP_DATA_SIZE)
+        return 0;
+
+    memcpy(&recv_data->data, data, real_size);
+    recv_data->size = real_size;
+    recv_data->data[real_size] = '\0';
+
+    return real_size;
+}
+
+/* Converts Tox ID string contained in recv_data to binary format and puts it in thread's ID buffer.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+#define ID_PREFIX "\"tox_id\": \""
+static int process_response(struct Recv_Data *recv_data)
+{
+    size_t prefix_size = strlen(ID_PREFIX);
+
+    if (recv_data->size < TOX_ADDRESS_SIZE * 2 + prefix_size)
+        return -1;
+
+    const char *IDstart = strstr(recv_data->data, ID_PREFIX);
+
+    if (IDstart == NULL)
+        return -1;
+
+    if (strlen(IDstart) < TOX_ADDRESS_SIZE * 2 + prefix_size)
+        return -1;
+
+    char ID_string[TOX_ADDRESS_SIZE * 2 + 1];
+    memcpy(ID_string, IDstart + prefix_size, TOX_ADDRESS_SIZE * 2);
+    ID_string[TOX_ADDRESS_SIZE * 2] = 0;
+
+    if (hex_string_to_bin(ID_string, strlen(ID_string), t_data.id_bin, sizeof(t_data.id_bin)) == -1)
+        return -1;
+
+    return 0;
+}
+
+/* Sets proxy info for given CURL handler.
+ *
+ * Returns 0 on success or if no proxy is set by the client.
+ * Returns -1 on failure.
+ */
+static int set_lookup_proxy(ToxWindow *self, CURL *c_handle, const char *proxy_address, uint16_t port, uint8_t proxy_type)
+{
+    if (proxy_type == TOX_PROXY_TYPE_NONE)
+        return 0;
+
+    if (proxy_address == NULL || port == 0) {
+        lookup_error(self, "Unknown proxy error");
+        return -1;
+    }
+
+    int ret = curl_easy_setopt(c_handle, CURLOPT_PROXYPORT, (long) port);
+
+    if (ret != CURLE_OK) {
+        lookup_error(self, "Failed to set proxy port (libcurl error %d)", ret);
+        return -1;
+    }
+
+    long int type = proxy_type == TOX_PROXY_TYPE_SOCKS5 ? CURLPROXY_SOCKS5_HOSTNAME : CURLPROXY_HTTP;
+
+    ret = curl_easy_setopt(c_handle, CURLOPT_PROXYTYPE, type);
+
+    if (ret != CURLE_OK) {
+        lookup_error(self, "Failed to set proxy type (libcurl error %d)", ret);
+        return -1;
+    }
+
+    ret = curl_easy_setopt(c_handle, CURLOPT_PROXY, proxy_address);
+
+    if (ret != CURLE_OK) {
+        lookup_error(self, "Failed to set proxy (libcurl error %d)", ret);
+        return -1;
+    }
+
+    return 0;
+}
+
+void *lookup_thread_func(void *data)
+{
+    ToxWindow *self = t_data.self;
+
+    char input_domain[MAX_STR_SIZE];
+    char name[MAX_STR_SIZE];
+
+    if (parse_addr(t_data.addr, name, sizeof(name), input_domain, sizeof(input_domain)) == -1) {
+        lookup_error(self, "Input must be a 76 character Tox ID or an address in the form: username@domain");
+        kill_lookup_thread();
+    }
+
+    char nameserver_key[SERVER_KEY_SIZE];
+    char real_domain[MAX_DOMAIN_SIZE];
+
+    if (!get_domain_match(nameserver_key, real_domain, sizeof(real_domain), input_domain)) {
+        if (!strcasecmp(input_domain, "utox.org"))
+            lookup_error(self, "utox.org uses deprecated DNS-based lookups and is no longer supported by Toxic");
+        else
+            lookup_error(self, "Name server domain not found.");
+
+        kill_lookup_thread();
+    }
+
+    CURL *c_handle = curl_easy_init();
+
+    if (!c_handle) {
+        lookup_error(self, "curl handler error");
+        kill_lookup_thread();
+    }
+
+    struct Recv_Data recv_data;
+    memset(&recv_data, 0, sizeof(struct Recv_Data));
+
+    char post_data[MAX_STR_SIZE];
+    snprintf(post_data, sizeof(post_data), "{\"action\": 3, \"name\": \"%s\"}", name);
+
+    struct curl_slist *headers = NULL;
+
+    headers = curl_slist_append(headers, "Content-Type: application/json");
+    headers = curl_slist_append(headers, "charsets: utf-8");
+
+    curl_easy_setopt(c_handle, CURLOPT_HTTPHEADER, headers);
+    curl_easy_setopt(c_handle, CURLOPT_URL, real_domain);
+    curl_easy_setopt(c_handle, CURLOPT_WRITEFUNCTION, write_lookup_data);
+    curl_easy_setopt(c_handle, CURLOPT_WRITEDATA, (void *) &recv_data);
+    curl_easy_setopt(c_handle, CURLOPT_USERAGENT, "libcurl-agent/1.0");
+    curl_easy_setopt(c_handle, CURLOPT_POSTFIELDS, post_data);
+
+    if (set_lookup_proxy(self, c_handle, arg_opts.proxy_address, arg_opts.proxy_port, arg_opts.proxy_type) == -1)
+        goto on_exit;
+
+    int ret = curl_easy_setopt(c_handle, CURLOPT_USE_SSL, CURLUSESSL_ALL);
+
+    if (ret != CURLE_OK) {
+        lookup_error(self, "TLS could not be enabled (libcurl error %d)", ret);
+        goto on_exit;
+    }
+
+    ret = curl_easy_setopt(c_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2);
+
+    if (ret != CURLE_OK) {
+        lookup_error(self, "TLSv1.2 could not be set (libcurl error %d)", ret);
+        goto on_exit;
+    }
+
+    ret = curl_easy_setopt(c_handle, CURLOPT_SSL_CIPHER_LIST, TLS_CIPHER_SUITE_LIST);
+
+    if (ret != CURLE_OK) {
+        lookup_error(self, "Failed to set TLS cipher list (libcurl error %d)", ret);
+        goto on_exit;
+    }
+
+    ret = curl_easy_perform(c_handle);
+
+    if (ret != CURLE_OK) {
+        /* If system doesn't support any of the specified ciphers suites, fall back to default */
+        if (ret == CURLE_SSL_CIPHER) {
+            curl_easy_setopt(c_handle, CURLOPT_SSL_CIPHER_LIST, NULL);
+            ret = curl_easy_perform(c_handle);
+        }
+
+        if (ret != CURLE_OK) {
+            lookup_error(self, "HTTPS lookup error (libcurl error %d)", ret);
+            goto on_exit;
+        }
+    }
+
+    if (process_response(&recv_data) == -1) {
+        lookup_error(self, "Bad response.");
+        goto on_exit;
+    }
+
+    pthread_mutex_lock(&Winthread.lock);
+    cmd_add_helper(self, t_data.m, t_data.id_bin, t_data.msg);
+    pthread_mutex_unlock(&Winthread.lock);
+
+on_exit:
+    curl_slist_free_all(headers);
+    curl_easy_cleanup(c_handle);
+    kill_lookup_thread();
+
+    return 0;
+}
+
+void name_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr, const char *message)
+{
+    if (t_data.disabled) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "name lookups are disabled.");
+        return;
+    }
+
+    if (t_data.busy) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Please wait for previous name lookup to finish.");
+        return;
+    }
+
+    snprintf(t_data.id_bin, sizeof(t_data.id_bin), "%s", id_bin);
+    snprintf(t_data.addr, sizeof(t_data.addr), "%s", addr);
+    snprintf(t_data.msg, sizeof(t_data.msg), "%s", message);
+    t_data.self = self;
+    t_data.m = m;
+    t_data.busy = true;
+
+    if (pthread_attr_init(&lookup_thread.attr) != 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, "Error: lookup thread attr failed to init");
+        memset(&t_data, 0, sizeof(struct thread_data));
+        return;
+    }
+
+    if (pthread_attr_setdetachstate(&lookup_thread.attr, PTHREAD_CREATE_DETACHED) != 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, "Error: lookup thread attr failed to set");
+        pthread_attr_destroy(&lookup_thread.attr);
+        memset(&t_data, 0, sizeof(struct thread_data));
+        return;
+    }
+
+    if (pthread_create(&lookup_thread.tid, &lookup_thread.attr, lookup_thread_func, NULL) != 0) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, "Error: lookup thread failed to init");
+        pthread_attr_destroy(&lookup_thread.attr);
+        memset(&t_data, 0, sizeof(struct thread_data));
+        return;
+    }
+}
+
+/* Initializes http based name lookups. Note: This function must be called only once before additional
+ * threads are spawned.
+ *
+ * Returns 0 on success.
+ * Returns -1 if curl failed to init.
+ * Returns -2 if the nameserver list cannot be found.
+ * Returns -3 if the nameserver list does not contain any valid entries.
+ */
+int name_lookup_init(void)
+{
+    if (curl_global_init(CURL_GLOBAL_ALL) != 0) {
+        t_data.disabled = true;
+        return -1;
+    }
+
+    const char *path = arg_opts.nameserver_path[0] ? arg_opts.nameserver_path : PACKAGE_DATADIR "/nameservers";
+    int ret = load_nameserver_list(path);
+
+    if (ret != 0) {
+        t_data.disabled = true;
+        return ret;
+    }
+
+    return 0;
+}
+
+void name_lookup_cleanup(void)
+{
+    curl_global_cleanup();
+}

src/name_lookup.h

@@ -0,0 +1,37 @@
+/*  name_lookup.h
+ *
+ *
+ *  Copyright (C) 2015 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic 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.
+ *
+ *  Toxic 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 Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef NAME_LOOKUP
+#define NAME_LOOKUP
+
+/* Initializes http based name lookups. Note: This function must be called only once before additional
+ * threads are spawned.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int name_lookup_init(void);
+void name_lookup_cleanup(void);
+
+int name_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr, const char *message);
+
+#endif /* NAME_LOOKUP */

src/notify.c

@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 
 #include "notify.h"
-#include "device.h"
+#include "audio_device.h"
 #include "settings.h"
 #include "line_info.h"
 #include "misc_tools.h"

src/osx_video.h

@@ -0,0 +1,54 @@
+/*  osx_video.h
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic 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.
+ *
+ *  Toxic 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 Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef OSX_VIDEO_H
+#define OSX_VIDEO_H
+
+#include <netinet/in.h>
+
+#ifdef __OBJC__
+#import <Foundation/Foundation.h>
+#import <AVFoundation/AVFoundation.h>
+#endif /* __OBJC__ */
+
+#define RELEASE_CHK(func, obj) if ((obj))\
+ 	func((obj));
+
+void bgrtoyuv420(uint8_t *plane_y, uint8_t *plane_u, uint8_t *plane_v, uint8_t *rgb, uint16_t width, uint16_t height);
+
+#ifdef __OBJC__
+@interface OSXVideo : NSObject <AVCaptureVideoDataOutputSampleBufferDelegate>
+- (instancetype)initWithDeviceNames:(char **)device_names AmtDevices:(int *)size;
+@end
+#endif /* __OBJC__ */
+
+int osx_video_init(char **device_names, int *size);
+void osx_video_release();
+/* Start device */
+int osx_video_open_device(uint32_t selection, uint16_t *width, uint16_t *height);
+/* Stop device */
+void osx_video_close_device(uint32_t device_idx);
+/* Read data from device */
+int osx_video_read_device(uint8_t *y, uint8_t *u, uint8_t *v, uint16_t *width, uint16_t *height);
+
+
+#endif /* OSX_VIDEO_H */

src/osx_video.m

@@ -0,0 +1,308 @@
+/*  osx_video.m
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic 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.
+ *
+ *  Toxic 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 Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef __OBJC__
+#include "osx_video.h"
+
+#import <Foundation/Foundation.h>
+#import <AVFoundation/AVFoundation.h>
+
+#include "line_info.h"
+#include "settings.h"
+
+#include <errno.h>
+
+#include <stdbool.h>
+#include <string.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <assert.h>
+
+/*
+ * Helper video format functions
+ */
+static uint8_t rgb_to_y(int r, int g, int b)
+{
+    int y = ((9798 * r + 19235 * g + 3736 * b) >> 15);
+    return y>255? 255 : y<0 ? 0 : y;
+}
+
+static uint8_t rgb_to_u(int r, int g, int b)
+{
+    int u = ((-5538 * r + -10846 * g + 16351 * b) >> 15) + 128;
+    return u>255? 255 : u<0 ? 0 : u;
+}
+
+static uint8_t rgb_to_v(int r, int g, int b)
+{
+    int v = ((16351 * r + -13697 * g + -2664 * b) >> 15) + 128;
+    return v>255? 255 : v<0 ? 0 : v;
+}
+
+void bgrxtoyuv420(uint8_t *plane_y, uint8_t *plane_u, uint8_t *plane_v, uint8_t *rgb, uint16_t width, uint16_t height)
+{
+    uint16_t x, y;
+    uint8_t *p;
+    uint8_t r, g, b;
+
+    for(y = 0; y != height; y += 2) {
+        p = rgb;
+        for(x = 0; x != width; x++) {
+            b = *rgb++;
+            g = *rgb++;
+            r = *rgb++;
+            rgb++;
+
+            *plane_y++ = rgb_to_y(r, g, b);
+        }
+
+        for(x = 0; x != width / 2; x++) {
+            b = *rgb++;
+            g = *rgb++;
+            r = *rgb++;
+            rgb++;
+
+            *plane_y++ = rgb_to_y(r, g, b);
+
+            b = *rgb++;
+            g = *rgb++;
+            r = *rgb++;
+            rgb++;
+
+            *plane_y++ = rgb_to_y(r, g, b);
+
+            b = ((int)b + (int)*(rgb - 8) + (int)*p + (int)*(p + 4) + 2) / 4; p++;
+            g = ((int)g + (int)*(rgb - 7) + (int)*p + (int)*(p + 4) + 2) / 4; p++;
+            r = ((int)r + (int)*(rgb - 6) + (int)*p + (int)*(p + 4) + 2) / 4; p++;
+            p++;
+
+            *plane_u++ = rgb_to_u(r, g, b);
+            *plane_v++ = rgb_to_v(r, g, b);
+
+            p += 4;
+        }
+    }
+}
+/*
+ * End of helper video format functions
+ */
+
+
+
+/*
+ * Implementation for OSXVideo
+ */
+@implementation OSXVideo {
+    dispatch_queue_t _processingQueue;
+    AVCaptureSession *_session;
+    AVCaptureVideoDataOutput *_linkerVideo;
+
+    CVImageBufferRef _currentFrame;
+    pthread_mutex_t _frameLock;
+    BOOL _shouldMangleDimensions;
+}
+
+- (instancetype)initWithDeviceNames: (char **)device_names AmtDevices: (int *)size {
+    _session = [[AVCaptureSession alloc] init];
+
+    NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+    int i;
+    for (i = 0; i < [devices count]; ++i) {
+        AVCaptureDevice *device = [devices objectAtIndex:i];
+        char *video_input_name;
+        NSString *localizedName = [device localizedName];
+        video_input_name = (char*)malloc(strlen([localizedName cStringUsingEncoding:NSUTF8StringEncoding]) + 1);
+        strcpy(video_input_name, (char*)[localizedName cStringUsingEncoding:NSUTF8StringEncoding]);
+        device_names[i] = video_input_name;
+    }
+
+    if ( i <= 0 )
+        return nil;
+    *size = i;
+
+    return self;
+}
+
+- (void)dealloc {
+    pthread_mutex_destroy(&_frameLock);
+    [_session release];
+    [_linkerVideo release];
+    dispatch_release(_processingQueue);
+    [super dealloc];
+}
+
+- (int)openVideoDeviceIndex: (uint32_t)device_idx Width: (uint16_t *)width Height: (uint16_t *)height {
+    pthread_mutex_init(&_frameLock, NULL);
+    pthread_mutex_lock(&_frameLock);
+    _processingQueue = dispatch_queue_create("Toxic processing queue", DISPATCH_QUEUE_SERIAL);
+    NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+    AVCaptureDevice *device = [devices objectAtIndex:device_idx];
+    NSError *error = NULL;
+    AVCaptureInput *input = [[AVCaptureDeviceInput alloc] initWithDevice:device error:&error];
+
+    if ( error != NULL ) {
+        [input release];
+        return -1;
+    }
+
+    [_session beginConfiguration];
+    [_session addInput:input];
+    //_session.sessionPreset = AVCaptureSessionPreset640x480;
+    //*width = 640;
+    //*height = 480;
+    _shouldMangleDimensions = YES;
+    [_session commitConfiguration];
+    [input release];
+    [device release];
+
+    /* Obtain device resolution */
+    AVCaptureInputPort *port = [input.ports objectAtIndex:0];
+    CMFormatDescriptionRef format_description = port.formatDescription;
+    if ( format_description ) {
+        CMVideoDimensions dimensions = CMVideoFormatDescriptionGetDimensions(format_description);
+        *width = dimensions.width;
+        *height = dimensions.height;
+    } else {
+        *width = 0;
+        *height = 0;
+    }
+
+    _linkerVideo = [[AVCaptureVideoDataOutput alloc] init];
+    [_linkerVideo setSampleBufferDelegate:self queue:_processingQueue];
+    // TODO possibly get a better pixel format
+    if (_shouldMangleDimensions) {
+        [_linkerVideo setVideoSettings:@{(id)kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA),
+                                         (id)kCVPixelBufferWidthKey: @640,
+                                         (id)kCVPixelBufferHeightKey: @480}];
+    } else {
+        [_linkerVideo setVideoSettings:@{(id)kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA)}];
+    }
+    [_session addOutput:_linkerVideo];
+    [_session startRunning];
+
+    pthread_mutex_unlock(&_frameLock);
+    return 0;
+}
+
+- (void)closeVideoDeviceIndex: (uint32_t)device_idx {
+    NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+    AVCaptureDevice *device = [devices objectAtIndex:device_idx];
+    NSError *error = NULL;
+    AVCaptureInput *input = [[AVCaptureDeviceInput alloc] initWithDevice:device error:&error];
+    [_session stopRunning];
+    [_session removeOutput:_linkerVideo];
+    [_session removeInput:input];
+    [_linkerVideo release];
+}
+
+- (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer fromConnection:(AVCaptureConnection *)connection {
+    pthread_mutex_lock(&_frameLock);
+    CVImageBufferRef img = CMSampleBufferGetImageBuffer(sampleBuffer);
+    if (!img) {
+        NSLog(@"Toxic WARNING: Bad sampleBuffer from AVfoundation!");
+    } else {
+        CVPixelBufferUnlockBaseAddress(_currentFrame, kCVPixelBufferLock_ReadOnly);
+        RELEASE_CHK(CFRelease, _currentFrame);
+
+        _currentFrame = (CVImageBufferRef)CFRetain(img);
+        // we're not going to do anything to it, so it's safe to lock it always
+        CVPixelBufferLockBaseAddress(_currentFrame, kCVPixelBufferLock_ReadOnly);
+    }
+    pthread_mutex_unlock(&_frameLock);
+}
+
+- (int)getVideoFrameY: (uint8_t *)y U: (uint8_t *)u V: (uint8_t *)v Width: (uint16_t *)width Height: (uint16_t *)height {
+    if (!_currentFrame) {
+        return -1;
+    }
+
+    pthread_mutex_lock(&_frameLock);
+    CFRetain(_currentFrame);
+
+    CFTypeID imageType = CFGetTypeID(_currentFrame);
+    if (imageType == CVPixelBufferGetTypeID()) {
+        // TODO maybe handle other formats
+        bgrxtoyuv420(y, u, v, CVPixelBufferGetBaseAddress(_currentFrame), *width, *height);
+    } else if (imageType == CVOpenGLBufferGetTypeID()) {
+        // OpenGL pbuffer
+    } else if (imageType == CVOpenGLTextureGetTypeID()) {
+        // OpenGL Texture (Do we need to handle these?)
+    }
+
+    CVPixelBufferRelease(_currentFrame);
+    pthread_mutex_unlock(&_frameLock);
+    return 0;
+}
+
+@end
+/*
+ * End of implementation for OSXVideo
+ */
+
+
+/*
+ * C-interface for OSXVideo
+ */
+static OSXVideo* _OSXVideo = nil;
+
+int osx_video_init(char **device_names, int *size)
+{
+    _OSXVideo = [[OSXVideo alloc] initWithDeviceNames: device_names AmtDevices: size];
+
+    if ( _OSXVideo == nil )
+        return -1;
+
+    return 0;
+}
+
+void osx_video_release()
+{
+    [_OSXVideo release];
+    _OSXVideo = nil;
+}
+
+int osx_video_open_device(uint32_t selection, uint16_t *width, uint16_t *height)
+{
+    if ( _OSXVideo == nil )
+        return -1;
+
+    return [_OSXVideo openVideoDeviceIndex: selection Width: width Height: height];
+}
+
+void osx_video_close_device(uint32_t device_idx)
+{
+    [_OSXVideo closeVideoDeviceIndex: device_idx];
+}
+
+int osx_video_read_device(uint8_t *y, uint8_t *u, uint8_t *v, uint16_t *width, uint16_t *height)
+{
+    if ( _OSXVideo == nil )
+        return -1;
+
+    return [_OSXVideo getVideoFrameY: y U: u V: v Width: width Height: height];
+}
+/*
+ * End of C-interface for OSXVideo
+ */
+
+#endif /* __OBJC__ */

src/prompt.c

@@ -49,12 +49,13 @@ extern struct Winthread Winthread;
 
 extern FriendsList Friends;
 FriendRequests FrndRequests;
-
-#ifdef AUDIO
-#define AC_NUM_GLOB_COMMANDS 18
+#ifdef VIDEO
+#define AC_NUM_GLOB_COMMANDS 22
+#elif AUDIO
+#define AC_NUM_GLOB_COMMANDS 20
 #else
-#define AC_NUM_GLOB_COMMANDS 16
-#endif /* AUDIO */
+#define AC_NUM_GLOB_COMMANDS 18
+#endif
 
 /* Array of global command names used for tab completion. */
 static const char glob_cmd_list[AC_NUM_GLOB_COMMANDS][MAX_CMDNAME_SIZE] = {
@@ -69,8 +70,10 @@ static const char glob_cmd_list[AC_NUM_GLOB_COMMANDS][MAX_CMDNAME_SIZE] = {
     { "/help"       },
     { "/log"        },
     { "/myid"       },
+    { "/myqr"       },
     { "/nick"       },
     { "/note"       },
+    { "/nospam"     },
     { "/quit"       },
     { "/requests"   },
     { "/status"     },
@@ -81,6 +84,14 @@ static const char glob_cmd_list[AC_NUM_GLOB_COMMANDS][MAX_CMDNAME_SIZE] = {
     { "/sdev"        },
 
 #endif /* AUDIO */
+
+#ifdef VIDEO
+
+    { "/lsvdev"      },
+    { "/svdev"       },
+
+#endif /* VIDEO */
+
 };
 
 void kill_prompt_window(ToxWindow *self)
@@ -175,7 +186,7 @@ static void prompt_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
     getyx(self->window, y, x);
     getmaxyx(self->window, y2, x2);
 
-    if (x2 <= 0)
+    if (x2 <= 0 || y2 <= 0)
         return;
 
     /* ignore non-menu related input if active */
@@ -246,6 +257,9 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
     int x2, y2;
     getmaxyx(self->window, y2, x2);
 
+    if (y2 <= 0 || x2 <= 0)
+        return;
+
     ChatContext *ctx = self->chatwin;
 
     pthread_mutex_lock(&Winthread.lock);
@@ -421,6 +435,10 @@ void prompt_init_statusbar(ToxWindow *self, Tox *m)
 {
     int x2, y2;
     getmaxyx(self->window, y2, x2);
+
+    if (y2 <= 0 || x2 <= 0)
+        exit_toxic_err("failed in prompt_init_statusbar", FATALERR_CURSES);
+
     (void) y2;
 
     /* Init statusbar info */
@@ -478,6 +496,9 @@ static void prompt_onInit(ToxWindow *self, Tox *m)
     int y2, x2;
     getmaxyx(self->window, y2, x2);
 
+    if (y2 <= 0 || x2 <= 0)
+        exit_toxic_err("failed in prompt_onInit", FATALERR_CURSES);
+
     ChatContext *ctx = self->chatwin;
     ctx->history = subwin(self->window, y2 - CHATBOX_HEIGHT + 1, x2, 0, 0);
     ctx->linewin = subwin(self->window, CHATBOX_HEIGHT, x2, y2 - CHATBOX_HEIGHT, 0);
@@ -510,6 +531,7 @@ ToxWindow new_prompt(void)
     ToxWindow ret;
     memset(&ret, 0, sizeof(ret));
 
+    ret.num = -1;
     ret.active = true;
     ret.is_prompt = true;
 

src/qr_code.c

@@ -0,0 +1,89 @@
+/*  qr_obj_code.c
+ *
+ *
+ *  Copyright (C) 2015 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic 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.
+ *
+ *  Toxic 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 Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdlib.h>
+#include <qrencode.h>
+#include <stdbool.h>
+
+#include "toxic.h"
+#include "windows.h"
+#include "qr_code.h"
+
+#define BORDER_LEN 1
+#define CHAR_1 "\342\226\210"
+#define CHAR_2 "\342\226\204"
+#define CHAR_3 "\342\226\200"
+
+/* Converts a tox ID string into a QRcode and prints it to the given file stream.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int ID_to_QRcode(const char *tox_id, FILE *fp)
+{
+    if (fp == NULL)
+        return -1;
+
+    QRcode *qr_obj = QRcode_encodeString(tox_id, 0, QR_ECLEVEL_L, QR_MODE_8, 0);
+
+    if (qr_obj == NULL)
+        return -1;
+
+    size_t width = qr_obj->width;
+    size_t i, j;
+
+    for (i = 0; i < width + BORDER_LEN * 2; ++i)
+        fprintf(fp, "%s", CHAR_1);
+
+    fprintf(fp, "\n");
+
+    for (i = 0; i < width; i += 2) {
+        for (j = 0; j < BORDER_LEN; ++j)
+            fprintf(fp, "%s", CHAR_1);
+
+        const unsigned char *row_1 = qr_obj->data + width * i;
+        const unsigned char *row_2 = row_1 + width;
+
+        for (j = 0; j < width; ++j) {
+            bool x = row_1[j] & 1;
+            bool y = (i + 1) < width ? (row_2[j] & 1) : false;
+
+            if (x && y)
+                fprintf(fp, " ");
+            else if (x)
+                fprintf(fp, "%s", CHAR_2);
+            else if (y)
+                fprintf(fp, "%s", CHAR_3);
+            else
+                fprintf(fp, "%s", CHAR_1);
+        }
+
+        for (j = 0; j < BORDER_LEN; ++j)
+            fprintf(fp, "%s", CHAR_1);
+
+        fprintf(fp, "\n");
+    }
+
+    QRcode_free(qr_obj);
+
+    return 0;
+}

src/qr_code.h

@@ -1,7 +1,7 @@
-/*  dns.c
+/*  qr_code.h
  *
  *
- *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *  Copyright (C) 2015 Toxic All Rights Reserved.
  *
  *  This file is part of Toxic.
  *
@@ -20,13 +20,16 @@
  *
  */
 
-/* Does DNS lookup for addr and puts resulting tox id in id_bin.
-   Return 0 on success, -1 on failure. */
+#ifndef QR_CODE
+#define QR_CODE
 
-#ifndef DNS_H
-#define DNS_H
+#define QRCODE_FILENAME_EXT ".QRcode"
 
-/* creates new thread for dns3 lookup. Only allows one lookup at a time. */
-void dns3_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr, const char *msg);
+/* Converts a tox ID string into a QRcode and prints it to the given file stream.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+int ID_to_QRcode(const char *tox_id, FILE *fp);
 
-#endif /* #define DNS_H */
+#endif /* QR_CODE */

src/settings.c

@@ -32,7 +32,7 @@
 #include "misc_tools.h"
 
 #ifdef AUDIO
-    #include "device.h"
+    #include "audio_device.h"
 #endif /* AUDIO */
 
 #include "settings.h"

src/toxic.c

@@ -54,10 +54,11 @@
 #include "settings.h"
 #include "log.h"
 #include "notify.h"
-#include "device.h"
+#include "audio_device.h"
 #include "message_queue.h"
 #include "execute.h"
 #include "term_mplex.h"
+#include "name_lookup.h"
 
 #ifdef X11
     #include "xtra.h"
@@ -65,7 +66,10 @@
 
 #ifdef AUDIO
 #include "audio_call.h"
-ToxAv *av;
+#ifdef VIDEO
+#include "video_call.h"
+#endif /* VIDEO */
+ToxAV *av;
 #endif /* AUDIO */
 
 #ifndef PACKAGE_DATADIR
@@ -77,16 +81,16 @@ char *DATA_FILE = NULL;
 char *BLOCK_FILE = NULL;
 ToxWindow *prompt = NULL;
 
-#define DATANAME  "data"
-#define BLOCKNAME "data-blocklist"
+#define DATANAME  "toxic_profile.tox"
+#define BLOCKNAME "toxic_blocklist"
 
-#define AUTOSAVE_FREQ 60
+#define AUTOSAVE_FREQ 600
 #define MIN_PASSWORD_LEN 6
 #define MAX_PASSWORD_LEN 64
 
 struct Winthread Winthread;
 struct cqueue_thread cqueue_thread;
-struct audio_thread audio_thread;
+struct av_thread av_thread;
 struct arg_opts arg_opts;
 struct user_settings *user_settings = NULL;
 
@@ -149,12 +153,16 @@ void exit_toxic_success(Tox *m)
     terminate_notify();
 
 #ifdef AUDIO
+#ifdef VIDEO
+    terminate_video();
+#endif /* VIDEO */
     terminate_audio();
 #endif /* AUDIO */
 
     free_global_data();
     tox_kill(m);
     endwin();
+    name_lookup_cleanup();
 
 #ifdef X11
     /* We have to terminate xtra last coz reasons
@@ -299,10 +307,15 @@ static int load_nodelist(const char *filename)
 
         if (line_len >= MIN_NODE_LINE && line_len <= MAX_NODE_LINE) {
             const char *name = strtok(line, " ");
-            const char *port = strtok(NULL, " ");
+            const char *port_str = strtok(NULL, " ");
             const char *key_ascii = strtok(NULL, " ");
 
-            if (name == NULL || port == NULL || key_ascii == NULL)
+            if (name == NULL || port_str == NULL || key_ascii == NULL)
+                continue;
+
+            long int port = strtol(port_str, NULL, 10);
+
+            if (port <= 0 || port > MAX_PORT_RANGE)
                 continue;
 
             size_t key_len = strlen(key_ascii);
@@ -313,7 +326,7 @@ static int load_nodelist(const char *filename)
 
             snprintf(toxNodes.nodes[toxNodes.lines], sizeof(toxNodes.nodes[toxNodes.lines]), "%s", name);
             toxNodes.nodes[toxNodes.lines][NODELEN - 1] = 0;
-            toxNodes.ports[toxNodes.lines] = atoi(port);
+            toxNodes.ports[toxNodes.lines] = port;
 
             /* remove possible trailing newline from key string */
             char real_ascii_key[TOX_PUBLIC_KEY_SIZE * 2 + 1];
@@ -522,17 +535,21 @@ static void first_time_encrypt(const char *msg)
     system("clear");
 }
 
-/* Store Tox data to given location
+/* Store Tox profile data to path.
  *
- * Return 0 if stored successfully or ignoring data file.
- * Return -1 on error
+ * Return 0 if stored successfully.
+ * Return -1 on error.
  */
+#define TEMP_PROFILE_EXT ".tmp"
 int store_data(Tox *m, const char *path)
 {
     if (path == NULL)
         return -1;
 
-    FILE *fp = fopen(path, "wb");
+    char temp_path[strlen(path) + strlen(TEMP_PROFILE_EXT) + 1];
+    snprintf(temp_path, sizeof(temp_path), "%s%s", path, TEMP_PROFILE_EXT);
+
+    FILE *fp = fopen(temp_path, "wb");
 
     if (fp == NULL)
         return -1;
@@ -557,17 +574,23 @@ int store_data(Tox *m, const char *path)
         }
 
         if (fwrite(enc_data, enc_len, 1, fp) != 1) {
+            fprintf(stderr, "Failed to write profile data.\n");
             fclose(fp);
             return -1;
         }
     } else {  /* data will not be encrypted */
         if (fwrite(data, data_len, 1, fp) != 1) {
+            fprintf(stderr, "Failed to write profile data.\n");
             fclose(fp);
             return -1;
         }
     }
 
     fclose(fp);
+
+    if (rename(temp_path, path) != 0)
+        return -1;
+
     return 0;
 }
 
@@ -871,16 +894,16 @@ void *thread_cqueue(void *data)
 }
 
 #ifdef AUDIO
-void *thread_audio(void *data)
+void *thread_av(void *data)
 {
-    ToxAv *av = (ToxAv *) data;
+    ToxAV *av = (ToxAV *) data;
 
     while (true) {
         pthread_mutex_lock(&Winthread.lock);
-        toxav_do(av);
+        toxav_iterate(av);
         pthread_mutex_unlock(&Winthread.lock);
 
-        usleep(toxav_do_interval(av) * 1000);
+        usleep(toxav_iteration_interval(av) * 1000);
     }
 }
 #endif  /* AUDIO */
@@ -899,7 +922,7 @@ static void print_usage(void)
     fprintf(stderr, "  -o, --noconnect          Do not connect to the DHT network\n");
     fprintf(stderr, "  -p, --SOCKS5-proxy       Use SOCKS5 proxy: Requires [IP] [port]\n");
     fprintf(stderr, "  -P, --HTTP-proxy         Use HTTP proxy: Requires [IP] [port]\n");
-    fprintf(stderr, "  -r, --dnslist            Use specified DNSservers file\n");
+    fprintf(stderr, "  -r, --namelist           Use specified name lookup server list\n");
     fprintf(stderr, "  -t, --force-tcp          Force toxic to use a TCP connection (use with proxies)\n");
     fprintf(stderr, "  -T, --tcp-server         Act as a TCP relay server: Requires [port]\n");
     fprintf(stderr, "  -u, --unencrypt-data     Unencrypt an encrypted data file\n");
@@ -927,7 +950,7 @@ static void parse_args(int argc, char *argv[])
         {"nodes", required_argument, 0, 'n'},
         {"help", no_argument, 0, 'h'},
         {"noconnect", no_argument, 0, 'o'},
-        {"dnslist", required_argument, 0, 'r'},
+        {"namelist", required_argument, 0, 'r'},
         {"force-tcp", no_argument, 0, 't'},
         {"tcp-server", required_argument, 0, 'T'},
         {"SOCKS5-proxy", required_argument, 0, 'p'},
@@ -938,6 +961,7 @@ static void parse_args(int argc, char *argv[])
 
     const char *opts_str = "4bdehotuxc:f:n:r:p:P:T:";
     int opt, indexptr;
+    long int port = 0;
 
     while ((opt = getopt_long(argc, argv, opts_str, long_opts, &indexptr)) != -1) {
         switch (opt) {
@@ -1014,7 +1038,12 @@ static void parse_args(int argc, char *argv[])
                 if (++optind > argc || argv[optind-1][0] == '-')
                     exit_toxic_err("Proxy error", FATALERR_PROXY);
 
-                arg_opts.proxy_port = (uint16_t) atoi(argv[optind-1]);
+                port = strtol(argv[optind-1], NULL, 10);
+
+                if (port <= 0 || port > MAX_PORT_RANGE)
+                    exit_toxic_err("Proxy error", FATALERR_PROXY);
+
+                arg_opts.proxy_port = port;
                 break;
 
             case 'P':
@@ -1024,14 +1053,19 @@ static void parse_args(int argc, char *argv[])
                 if (++optind > argc || argv[optind-1][0] == '-')
                     exit_toxic_err("Proxy error", FATALERR_PROXY);
 
-                arg_opts.proxy_port = (uint16_t) atoi(argv[optind-1]);
+                port = strtol(argv[optind-1], NULL, 10);
+
+                if (port <= 0 || port > MAX_PORT_RANGE)
+                    exit_toxic_err("Proxy error", FATALERR_PROXY);
+
+                arg_opts.proxy_port = port;
                 break;
 
             case 'r':
-                snprintf(arg_opts.dns_path, sizeof(arg_opts.dns_path), "%s", optarg);
+                snprintf(arg_opts.nameserver_path, sizeof(arg_opts.nameserver_path), "%s", optarg);
 
-                if (!file_exists(arg_opts.dns_path))
-                    queue_init_message("DNSservers file not found");
+                if (!file_exists(arg_opts.nameserver_path))
+                    queue_init_message("nameserver list not found");
 
                 break;
 
@@ -1040,7 +1074,12 @@ static void parse_args(int argc, char *argv[])
                 break;
 
             case 'T':
-                arg_opts.tcp_port = (uint16_t) atoi(optarg);
+                port = strtol(optarg, NULL, 10);
+
+                if (port <= 0 || port > MAX_PORT_RANGE)
+                    port = 14191;
+
+                arg_opts.tcp_port = port;
                 break;
 
             case 'u':
@@ -1055,26 +1094,72 @@ static void parse_args(int argc, char *argv[])
     }
 }
 
-static int init_default_data_files(void)
+/* Looks for an old default profile data file and blocklist, and renames them to the new default names.
+ *
+ * Returns 0 on success.
+ * Returns -1 on failure.
+ */
+#define OLD_DATA_NAME "data"
+#define OLD_DATA_BLOCKLIST_NAME "data-blocklist"
+static int rename_old_profile(const char *user_config_dir)
 {
-    if (arg_opts.use_custom_data)
+    char old_data_file[strlen(user_config_dir) + strlen(CONFIGDIR) + strlen(OLD_DATA_NAME) + 1];
+    snprintf(old_data_file, sizeof(old_data_file), "%s%s%s", user_config_dir, CONFIGDIR, OLD_DATA_NAME);
+
+    if (!file_exists(old_data_file))
         return 0;
 
+    if (file_exists(DATA_FILE))
+        return 0;
+
+    if (rename(old_data_file, DATA_FILE) != 0)
+        return -1;
+
+    queue_init_message("Data file has been moved to %s", DATA_FILE);
+
+    char old_data_blocklist[strlen(user_config_dir) + strlen(CONFIGDIR) + strlen(OLD_DATA_BLOCKLIST_NAME) + 1];
+    snprintf(old_data_blocklist, sizeof(old_data_blocklist), "%s%s%s", user_config_dir, CONFIGDIR, OLD_DATA_BLOCKLIST_NAME);
+
+    if (!file_exists(old_data_blocklist))
+        return 0;
+
+    if (file_exists(BLOCK_FILE))
+        return 0;
+
+    if (rename(old_data_blocklist, BLOCK_FILE) != 0)
+        return -1;
+
+    return 0;
+}
+
+/* Initializes the default config directory and data files used by toxic.
+ *
+ * Exits the process with an error on failure.
+ */
+static void init_default_data_files(void)
+{
+    if (arg_opts.use_custom_data)
+        return;
+
     char *user_config_dir = get_user_config_dir();
+
+    if (user_config_dir == NULL)
+        exit_toxic_err("failed in init_default_data_files()", FATALERR_FILEOP);
+
     int config_err = create_user_config_dirs(user_config_dir);
 
-    if (config_err) {
+    if (config_err == -1) {
         DATA_FILE = strdup(DATANAME);
         BLOCK_FILE = strdup(BLOCKNAME);
 
         if (DATA_FILE == NULL || BLOCK_FILE == NULL)
-            exit_toxic_err("failed in load_data_structures", FATALERR_MEMORY);
+            exit_toxic_err("failed in init_default_data_files()", FATALERR_MEMORY);
     } else {
         DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen(DATANAME) + 1);
         BLOCK_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen(BLOCKNAME) + 1);
 
         if (DATA_FILE == NULL || BLOCK_FILE == NULL)
-            exit_toxic_err("failed in load_data_structures", FATALERR_MEMORY);
+            exit_toxic_err("failed in init_default_data_files()", FATALERR_MEMORY);
 
         strcpy(DATA_FILE, user_config_dir);
         strcat(DATA_FILE, CONFIGDIR);
@@ -1085,8 +1170,11 @@ static int init_default_data_files(void)
         strcat(BLOCK_FILE, BLOCKNAME);
     }
 
+    /* For backwards compatibility with old toxic profile names. TODO: remove this some day */
+    if (rename_old_profile(user_config_dir) == -1)
+        queue_init_message("Warning: Profile backwards compatibility failed.");
+
     free(user_config_dir);
-    return config_err;
 }
 
 #define REC_TOX_DO_LOOPS_PER_SEC 25
@@ -1117,11 +1205,11 @@ void DnD_callback(const char* asdv, DropType dt)
 
     // pthread_mutex_lock(&Winthread.lock);
     // line_info_add(prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, asdv);
-    pthread_mutex_unlock(&Winthread.lock);
+    // pthread_mutex_unlock(&Winthread.lock);
 }
 #endif /* X11 */
 
-int main(int argc, char *argv[])
+int main(int argc, char **argv)
 {
     parse_args(argc, argv);
 
@@ -1138,7 +1226,8 @@ int main(int argc, char *argv[])
     /* Make sure all written files are read/writeable only by the current user. */
     umask(S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 
-    int config_err = init_default_data_files();
+    init_default_data_files();
+
     bool datafile_exists = file_exists(DATA_FILE);
 
     if (datafile_exists)
@@ -1157,7 +1246,18 @@ int main(int argc, char *argv[])
         exit_toxic_err("failed in main", FATALERR_MEMORY);
 
     const char *p = arg_opts.config_path[0] ? arg_opts.config_path : NULL;
-    int settings_err = settings_load(user_settings, p);
+
+    if (settings_load(user_settings, p) == -1)
+         queue_init_message("Failed to load user settings");
+
+    int nameserver_ret = name_lookup_init();
+
+    if (nameserver_ret == -1)
+        queue_init_message("curl failed to initialize; name lookup service is disabled.");
+    else if (nameserver_ret == -2)
+        queue_init_message("Name lookup server list could not be found.");
+    else if (nameserver_ret == -3)
+        queue_init_message("Name lookup server list does not contain any valid entries.");
 
 #ifdef X11
     if (init_xtra(DnD_callback) == -1)
@@ -1191,8 +1291,13 @@ int main(int argc, char *argv[])
 
     av = init_audio(prompt, m);
 
-    /* audio thread */
-    if (pthread_create(&audio_thread.tid, NULL, thread_audio, (void *) av) != 0)
+#ifdef VIDEO
+    init_video(prompt, m);
+
+#endif /* VIDEO */
+
+    /* AV thread */
+    if (pthread_create(&av_thread.tid, NULL, thread_av, (void *) av) != 0)
         exit_toxic_err("failed in main", FATALERR_THREAD_CREATE);
 
     set_primary_device(input, user_settings->audio_in_dev);
@@ -1206,16 +1311,6 @@ int main(int argc, char *argv[])
 
     init_notify(60, 3000);
 
-    const char *msg;
-
-    if (config_err) {
-        msg = "Unable to determine configuration directory. Defaulting to 'data' for data file...";
-        queue_init_message("%s", msg);
-    }
-
-    if (settings_err == -1)
-        queue_init_message("Failed to load user settings");
-
     /* screen/tmux auto-away timer */
     if (init_mplex_away_timer(m) == -1)
         queue_init_message("Failed to init mplex auto-away.");
@@ -1238,6 +1333,7 @@ int main(int argc, char *argv[])
 
     while (true) {
         do_toxic(m, prompt);
+
         uint64_t cur_time = get_unix_time();
 
         if (timed_out(last_save, AUTOSAVE_FREQ)) {

src/toxic.h

@@ -49,6 +49,10 @@
 #define KEY_IDENT_DIGITS 3    /* number of hex digits to display for the pub-key based identifier */
 #define TIME_STR_SIZE 32
 
+#ifndef MAX_PORT_RANGE
+#define MAX_PORT_RANGE 65535
+#endif
+
 /* ASCII key codes */
 #define T_KEY_ESC        0x1B     /* ESC key */
 #define T_KEY_KILL       0x0B     /* ctrl-k */
@@ -84,6 +88,7 @@ typedef enum _FATAL_ERRS {
     FATALERR_PROXY = -10,           /* Tox network failed to init using a proxy */
     FATALERR_ENCRYPT = -11,         /* Data file encryption failure */
     FATALERR_TOX_INIT = -12,        /* Tox instance failed to initialize */
+    FATALERR_CURSES = -13,          /* Unrecoverable Ncurses error */
 } FATAL_ERRS;
 
 /* Fixes text color problem on some terminals.

src/video_call.c

@@ -0,0 +1,423 @@
+/*  video_call.c
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic 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.
+ *
+ *  Toxic 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 Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "toxic.h"
+#include "windows.h"
+#include "video_call.h"
+#include "video_device.h"
+#include "chat_commands.h"
+#include "global_commands.h"
+#include "line_info.h"
+#include "notify.h"
+
+#include <stdbool.h>
+#include <curses.h>
+#include <string.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <assert.h>
+
+#define default_video_bit_rate 5000
+
+void receive_video_frame_cb( ToxAV *av, uint32_t friend_number,
+                                    uint16_t width, uint16_t height,
+                                    uint8_t const *y, uint8_t const *u, uint8_t const *v,
+                                    int32_t ystride, int32_t ustride, int32_t vstride,
+                                    void *user_data );
+
+void video_bit_rate_status_cb( ToxAV *av, uint32_t friend_number, uint32_t audio_bit_rate,
+                                    uint32_t video_bit_rate, void *user_data);
+
+static void print_err (ToxWindow *self, const char *error_str)
+{
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%s", error_str);
+}
+
+ToxAV *init_video(ToxWindow *self, Tox *tox)
+{
+    CallControl.video_errors = ve_None;
+
+    CallControl.video_enabled = true;
+    CallControl.video_bit_rate = 0;
+    CallControl.video_frame_duration = 10;
+
+    if ( !CallControl.av ) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Video failed to init with ToxAV instance");
+
+        return NULL;
+    }
+
+    if ( init_video_devices(CallControl.av) == vde_InternalError ) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to init video devices");
+
+        return NULL;
+    }
+
+    toxav_callback_video_receive_frame(CallControl.av, receive_video_frame_cb, &CallControl);
+    toxav_callback_bit_rate_status(CallControl.av, video_bit_rate_status_cb, &CallControl);
+
+    return CallControl.av;
+}
+
+void terminate_video()
+{
+    int i;
+    for (i = 0; i < MAX_CALLS; ++i) {
+        Call* this_call = &CallControl.calls[i];
+
+        stop_video_transmission(this_call, i);
+
+        if( this_call->vout_idx != -1 )
+            close_video_device(vdt_output, this_call->vout_idx);
+    }
+
+    terminate_video_devices();
+}
+
+void read_video_device_callback(int16_t width, int16_t height, const uint8_t* y, const uint8_t* u, const uint8_t* v, void* data)
+{
+    uint32_t friend_number = *((uint32_t*)data); /* TODO: Or pass an array of call_idx's */
+    Call* this_call = &CallControl.calls[friend_number];
+    TOXAV_ERR_SEND_FRAME error;
+
+    /* Drop frame if video sending is disabled */
+    if ( CallControl.video_bit_rate == 0 || this_call->vin_idx == -1 ) {
+        line_info_add(CallControl.prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, "Video frame dropped.");
+        return;
+    }
+
+    if ( toxav_video_send_frame(CallControl.av, friend_number, width, height, y, u, v, &error ) == false ) {
+        line_info_add(CallControl.prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to send video frame");
+
+        if ( error == TOXAV_ERR_SEND_FRAME_NULL )
+            line_info_add(CallControl.prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to capture video frame");
+        else if ( error == TOXAV_ERR_SEND_FRAME_INVALID )
+            line_info_add(CallControl.prompt, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to prepare video frame");
+    }
+}
+
+void write_video_device_callback(uint32_t friend_number, uint16_t width, uint16_t height,
+                                           uint8_t const *y, uint8_t const *u, uint8_t const *v,
+                                           int32_t ystride, int32_t ustride, int32_t vstride,
+                                           void *user_data)
+{
+    write_video_out(width, height, y, u, v, ystride, ustride, vstride, user_data);
+}
+
+int start_video_transmission(ToxWindow *self, ToxAV *av, Call *call)
+{
+    if ( !self || !av) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to prepare transmission");
+        return -1;
+    }
+
+    CallControl.video_bit_rate = default_video_bit_rate;
+
+    if ( toxav_bit_rate_set(CallControl.av, self->num, -1, CallControl.video_bit_rate, NULL) == false ) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set video bit rate");
+        return -1;
+    }
+
+    if ( open_primary_video_device(vdt_input, &call->vin_idx) != vde_None ) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to open input video device!");
+        return -1;
+    }
+
+    if ( register_video_device_callback(self->num, call->vin_idx, read_video_device_callback, &self->num) != vde_None ) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to register input video handler!");
+        return -1;
+    }
+
+    return 0;
+}
+
+int stop_video_transmission(Call *call, int friend_number)
+{
+    CallControl.video_bit_rate = 0;
+    toxav_bit_rate_set(CallControl.av, friend_number, -1, CallControl.video_bit_rate, NULL);
+
+    if ( call->vin_idx != -1 ) {
+        close_video_device(vdt_input, call->vin_idx);
+        call->vin_idx = -1;
+    }
+
+    return 0;
+}
+/*
+ * End of transmission
+ */
+
+
+
+
+
+/*
+ * Callbacks
+ */
+void receive_video_frame_cb(ToxAV *av, uint32_t friend_number,
+                                    uint16_t width, uint16_t height,
+                                    uint8_t const *y, uint8_t const *u, uint8_t const *v,
+                                    int32_t ystride, int32_t ustride, int32_t vstride,
+                                    void *user_data)
+{
+    write_video_device_callback(friend_number, width, height, y, u, v, ystride, ustride, vstride, user_data);
+}
+
+void video_bit_rate_status_cb(ToxAV *av, uint32_t friend_number, uint32_t audio_bit_rate,
+                                      uint32_t video_bit_rate, void *user_data)
+{
+    CallControl.video_bit_rate = video_bit_rate;
+    toxav_bit_rate_set(CallControl.av, friend_number, -1, CallControl.video_bit_rate, NULL);
+}
+
+void callback_recv_video_starting(uint32_t friend_number)
+{
+    Call* this_call = &CallControl.calls[friend_number];
+
+    if ( this_call->vout_idx != -1 )
+        return;
+
+    open_primary_video_device(vdt_output, &this_call->vout_idx);
+}
+void callback_recv_video_end(uint32_t friend_number)
+{
+    Call* this_call = &CallControl.calls[friend_number];
+
+    close_video_device(vdt_output, this_call->vout_idx);
+    this_call->vout_idx = -1;
+}
+void callback_video_starting(uint32_t friend_number)
+{
+    ToxWindow* windows = CallControl.prompt;
+    Call* this_call = &CallControl.calls[friend_number];
+
+    TOXAV_ERR_CALL_CONTROL error = TOXAV_ERR_CALL_CONTROL_OK;
+    toxav_call_control(CallControl.av, friend_number, TOXAV_CALL_CONTROL_SHOW_VIDEO, &error);
+
+    if (error == TOXAV_ERR_CALL_CONTROL_OK) {
+        size_t i;
+        for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
+            if ( windows[i].is_call && windows[i].num == friend_number ) {
+                if ( 0 != start_video_transmission(&windows[i], CallControl.av, this_call) ) {
+                    line_info_add(&windows[i], NULL, NULL, NULL, SYS_MSG, 0, 0, "Error starting transmission!");
+                    return;
+                }
+
+                line_info_add(&windows[i], NULL, NULL, NULL, SYS_MSG, 0, 0, "Video capture starting.");
+            }
+        }
+    }
+}
+void callback_video_end(uint32_t friend_number)
+{
+    stop_video_transmission(&CallControl.calls[friend_number], friend_number);
+}
+/*
+ * End of Callbacks
+ */
+
+
+
+/*
+ * Commands from chat_commands.h
+ */
+void cmd_video(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    const char *error_str;
+    Call* this_call = &CallControl.calls[self->num];
+
+    if ( argc != 0 ) {
+        error_str = "Unknown arguments.";
+        goto on_error;
+    }
+
+    if ( !CallControl.av ) {
+        error_str = "ToxAV not supported!";
+        goto on_error;
+    }
+
+    if ( !self->stb->connection ) {
+        error_str = "Friend is offline.";
+        goto on_error;
+    }
+
+    if ( !self->is_call ) {
+        error_str = "Not in call!";
+        goto on_error;
+    }
+
+    if ( this_call->vin_idx == -1 )
+        callback_video_starting(self->num);
+    else
+        callback_video_end(self->num);
+
+    return;
+on_error:
+    print_err (self, error_str);
+}
+
+void cmd_list_video_devices(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    const char *error_str;
+
+    if ( argc != 1 ) {
+        if ( argc < 1 ) error_str = "Type must be specified!";
+        else error_str = "Only one argument allowed!";
+
+        goto on_error;
+    }
+
+    VideoDeviceType type;
+
+    if ( strcasecmp(argv[1], "in") == 0 ) /* Input devices */
+        type = vdt_input;
+
+    else if ( strcasecmp(argv[1], "out") == 0 ) /* Output devices */
+        type = vdt_output;
+
+    else {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid type: %s", argv[1]);
+        return;
+    }
+
+    print_video_devices(self, type);
+
+    return;
+on_error:
+    print_err (self, error_str);
+}
+
+/* This changes primary video device only */
+void cmd_change_video_device(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    const char *error_str;
+
+    if ( argc != 2 ) {
+        if ( argc < 1 ) error_str = "Type must be specified!";
+        else if ( argc < 2 ) error_str = "Must have id!";
+        else error_str = "Only two arguments allowed!";
+
+        goto on_error;
+    }
+
+    VideoDeviceType type;
+
+    if ( strcmp(argv[1], "in") == 0 ) /* Input devices */
+        type = vdt_input;
+
+    else if ( strcmp(argv[1], "out") == 0 ) /* Output devices */
+        type = vdt_output;
+
+    else {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid type: %s", argv[1]);
+        return;
+    }
+
+
+    char *end;
+    long int selection = strtol(argv[2], &end, 10);
+
+    if ( *end ) {
+        error_str = "Invalid input";
+        goto on_error;
+    }
+
+    if ( set_primary_video_device(type, selection) == vde_InvalidSelection ) {
+        error_str = "Invalid selection!";
+        goto on_error;
+    }
+
+    return;
+on_error:
+    print_err (self, error_str);
+}
+
+void cmd_ccur_video_device(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    const char *error_str;
+
+    if ( argc != 2 ) {
+        if ( argc < 1 ) error_str = "Type must be specified!";
+        else if ( argc < 2 ) error_str = "Must have id!";
+        else error_str = "Only two arguments allowed!";
+
+        goto on_error;
+    }
+
+    VideoDeviceType type;
+
+    if ( strcmp(argv[1], "in") == 0 ) /* Input devices */
+        type = vdt_input;
+
+    else if ( strcmp(argv[1], "out") == 0 ) /* Output devices */
+        type = vdt_output;
+
+    else {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Invalid type: %s", argv[1]);
+        return;
+    }
+
+
+    char *end;
+    long int selection = strtol(argv[2], &end, 10);
+
+    if ( *end ) {
+        error_str = "Invalid input";
+        goto on_error;
+    }
+
+    if ( video_selection_valid(type, selection) == vde_InvalidSelection ) {
+        error_str="Invalid selection!";
+        goto on_error;
+    }
+
+    /* If call is active, change device */
+    if ( self->is_call ) {
+        Call* this_call = &CallControl.calls[self->num];
+        if ( this_call->ttas ) {
+
+            if ( type == vdt_output ) {
+            }
+            else {
+                /* TODO: check for failure */
+                close_video_device(vdt_input, this_call->vin_idx);
+                open_video_device(vdt_input, selection, &this_call->vin_idx);
+                register_video_device_callback(self->num, this_call->vin_idx, read_video_device_callback, &self->num);
+            }
+        }
+    }
+
+    self->video_device_selection[type] = selection;
+
+    return;
+    on_error:
+    print_err (self, error_str);
+}
+
+void stop_video_stream(ToxWindow *self)
+{
+    Call *this_call = &CallControl.calls[self->num];
+
+    if (this_call && this_call->vin_idx != -1)
+        stop_video_transmission(this_call, self->num);
+}

src/video_call.h

@@ -0,0 +1,44 @@
+/*  video_call.h
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic 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.
+ *
+ *  Toxic 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 Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef VIDEO_CALL_H
+#define VIDEO_CALL_H
+
+#include <tox/toxav.h>
+
+#include "audio_call.h"
+
+#include "video_device.h"
+
+/* You will have to pass pointer to first member of 'windows' declared in windows.c */
+ToxAV *init_video(ToxWindow *self, Tox *tox);
+void terminate_video();
+int start_video_transmission(ToxWindow *self, ToxAV *av, Call *call);
+int stop_video_transmission(Call *call, int friend_number);
+void stop_video_stream(ToxWindow *self);
+
+void callback_recv_video_starting(uint32_t friend_number);
+void callback_recv_video_end(uint32_t friend_number);
+void callback_video_starting(uint32_t friend_number);
+void callback_video_end(uint32_t friend_number);
+
+#endif /* VIDEO_CALL_H */

src/video_device.c

@@ -0,0 +1,782 @@
+/*  video_device.c
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic 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.
+ *
+ *  Toxic 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 Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "video_device.h"
+#include "video_call.h"
+
+#include <sys/ioctl.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xos.h>
+
+#include <vpx/vpx_image.h>
+
+#if defined(__linux__) || defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <linux/videodev2.h>
+#else /* __OSX__ */
+#import "osx_video.h"
+#endif
+
+#include "line_info.h"
+#include "settings.h"
+
+#include <errno.h>
+
+#include <stdbool.h>
+#include <string.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#define inline__ inline __attribute__((always_inline))
+
+extern struct user_settings *user_settings;
+
+struct VideoBuffer {
+    void *start;
+    size_t length;
+};
+
+typedef struct VideoDevice {
+    VideoDataHandleCallback cb;             /* Use this to handle data from input device usually */
+    void* cb_data;                          /* Data to be passed to callback */
+    int32_t friend_number;                  /* ToxAV friend number */
+
+#if defined(__linux__) || defined(__FreeBSD__)
+    int fd;                                 /* File descriptor of video device selected/opened */
+    struct v4l2_format fmt;
+    struct VideoBuffer *buffers;
+    uint32_t n_buffers;
+#endif
+
+    uint32_t ref_count;
+    int32_t selection;
+    pthread_mutex_t mutex[1];
+    uint16_t video_width;
+    uint16_t video_height;
+
+    vpx_image_t input;
+
+    Display *x_display;
+    Window x_window;
+    GC x_gc;
+
+} VideoDevice;
+
+const char *dvideo_device_names[2];              /* Default device */
+const char *video_devices_names[2][MAX_DEVICES]; /* Container of available devices */
+static int size[2];                        /* Size of above containers */
+VideoDevice *video_devices_running[2][MAX_DEVICES] = {{NULL}};     /* Running devices */
+uint32_t primary_video_device[2];          /* Primary device */
+
+#ifdef VIDEO
+static ToxAV* av = NULL;
+#endif /* VIDEO */
+
+/* q_mutex */
+#define lock pthread_mutex_lock(&video_mutex);
+#define unlock pthread_mutex_unlock(&video_mutex);
+pthread_mutex_t video_mutex;
+
+bool video_thread_running = true,
+      video_thread_paused = true;                /* Thread control */
+
+void* video_thread_poll(void*);
+
+static void yuv420tobgr(uint16_t width, uint16_t height, const uint8_t *y,
+                 const uint8_t *u, const uint8_t *v, unsigned int ystride,
+                 unsigned int ustride, unsigned int vstride, uint8_t *out)
+{
+    unsigned long int i, j;
+    for (i = 0; i < height; ++i) {
+        for (j = 0; j < width; ++j) {
+            uint8_t *point = out + 4 * ((i * width) + j);
+            int t_y = y[((i * ystride) + j)];
+            int t_u = u[(((i / 2) * ustride) + (j / 2))];
+            int t_v = v[(((i / 2) * vstride) + (j / 2))];
+            t_y = t_y < 16 ? 16 : t_y;
+
+            int r = (298 * (t_y - 16) + 409 * (t_v - 128) + 128) >> 8;
+            int g = (298 * (t_y - 16) - 100 * (t_u - 128) - 208 * (t_v - 128) + 128) >> 8;
+            int b = (298 * (t_y - 16) + 516 * (t_u - 128) + 128) >> 8;
+
+            point[2] = r>255? 255 : r<0 ? 0 : r;
+            point[1] = g>255? 255 : g<0 ? 0 : g;
+            point[0] = b>255? 255 : b<0 ? 0 : b;
+            point[3] = ~0;
+        }
+    }
+}
+
+#if defined(__linux__) || defined(__FreeBSD__)
+static void yuv422to420(uint8_t *plane_y, uint8_t *plane_u, uint8_t *plane_v,
+                 uint8_t *input, uint16_t width, uint16_t height)
+{
+    uint8_t *end = input + width * height * 2;
+    while (input != end) {
+        uint8_t *line_end = input + width * 2;
+        while (input != line_end) {
+            *plane_y++ = *input++;
+            *plane_u++ = *input++;
+            *plane_y++ = *input++;
+            *plane_v++ = *input++;
+        }
+
+        line_end = input + width * 2;
+        while (input != line_end) {
+            *plane_y++ = *input++;
+            input++;//u
+            *plane_y++ = *input++;
+            input++;//v
+        }
+    }
+}
+
+static int xioctl(int fh, unsigned long request, void *arg)
+{
+    int r;
+
+    do {
+        r = ioctl(fh, request, arg);
+    } while (-1 == r && EINTR == errno);
+
+    return r;
+}
+
+#endif /* __linux__ */
+
+/* Meet devices */
+#ifdef VIDEO
+VideoDeviceError init_video_devices(ToxAV* av_)
+#else
+VideoDeviceError init_video_devices()
+#endif /* VIDEO */
+{
+    size[vdt_input] = 0;
+
+#if defined(__linux__) || defined(__FreeBSD__)
+    for (; size[vdt_input] <= MAX_DEVICES; ++size[vdt_input]) {
+        int fd;
+        char device_address[] = "/dev/videoXX";
+        snprintf(device_address + 10, sizeof(char) * strlen(device_address) - 10, "%i", size[vdt_input]);
+
+        fd = open(device_address, O_RDWR | O_NONBLOCK, 0);
+        if ( fd == -1 ) {
+            break;
+        } else {
+            struct v4l2_capability cap;
+            char* video_input_name;
+
+            /* Query V4L for capture capabilities */
+            if ( -1 != ioctl(fd, VIDIOC_QUERYCAP, &cap) ) {
+                video_input_name = (char*)malloc(strlen((const char*)cap.card) + strlen(device_address) + 4);
+                strcpy(video_input_name, (char*)cap.card);
+                strcat(video_input_name, " (");
+                strcat(video_input_name, (char*)device_address);
+                strcat(video_input_name, ")");
+            } else {
+                video_input_name = (char*)malloc(strlen(device_address) + 3);
+                strcpy(video_input_name, "(");
+                strcat(video_input_name, device_address);
+                strcat(video_input_name, ")");
+            }
+            video_devices_names[vdt_input][size[vdt_input]] = video_input_name;
+
+            close(fd);
+        }
+    }
+
+#else /* __OSX__ */
+    if( osx_video_init((char**)video_devices_names[vdt_input], &size[vdt_input]) != 0 )
+        return vde_InternalError;
+#endif
+
+    size[vdt_output] = 1;
+    char* video_output_name = "Toxic Video Receiver";
+    video_devices_names[vdt_output][0] = video_output_name;
+
+    // Start poll thread
+    if ( pthread_mutex_init(&video_mutex, NULL) != 0 )
+        return vde_InternalError;
+
+    pthread_t thread_id;
+    if ( pthread_create(&thread_id, NULL, video_thread_poll, NULL) != 0 || pthread_detach(thread_id) != 0 )
+        return vde_InternalError;
+
+#ifdef VIDEO
+    av = av_;
+#endif /* VIDEO */
+
+    return (VideoDeviceError) vde_None;
+}
+
+VideoDeviceError terminate_video_devices()
+{
+    /* Cleanup if needed */
+    video_thread_running = false;
+    usleep(20000);
+
+    int i;
+    for (i = 0; i < size[vdt_input]; ++i) {
+        free((void*)video_devices_names[vdt_input][i]);
+    }
+
+    if ( pthread_mutex_destroy(&video_mutex) != 0 )
+        return (VideoDeviceError) vde_InternalError;
+
+#ifdef __OSX__
+    osx_video_release();
+#endif /* __OSX__ */
+
+    return (VideoDeviceError) vde_None;
+}
+
+VideoDeviceError register_video_device_callback(int32_t friend_number, uint32_t device_idx,
+                                                VideoDataHandleCallback callback, void* data)
+{
+#if defined(__linux__) || defined(__FreeBSD__)
+    if ( size[vdt_input] <= device_idx || !video_devices_running[vdt_input][device_idx] || !video_devices_running[vdt_input][device_idx]->fd )
+        return vde_InvalidSelection;
+#else /* __OSX__ */
+    if ( size[vdt_input] <= device_idx || !video_devices_running[vdt_input][device_idx] )
+        return vde_InvalidSelection;
+#endif
+
+    lock;
+    video_devices_running[vdt_input][device_idx]->cb = callback;
+    video_devices_running[vdt_input][device_idx]->cb_data = data;
+    video_devices_running[vdt_input][device_idx]->friend_number = friend_number;
+    unlock;
+
+    return vde_None;
+}
+
+VideoDeviceError set_primary_video_device(VideoDeviceType type, int32_t selection)
+{
+    if ( size[type] <= selection || selection < 0 ) return vde_InvalidSelection;
+
+    primary_video_device[type] = selection;
+
+    return vde_None;
+}
+
+VideoDeviceError open_primary_video_device(VideoDeviceType type, uint32_t* device_idx)
+{
+    return open_video_device(type, primary_video_device[type], device_idx);
+}
+
+void get_primary_video_device_name(VideoDeviceType type, char *buf, int size)
+{
+    memcpy(buf, dvideo_device_names[type], size);
+}
+
+VideoDeviceError open_video_device(VideoDeviceType type, int32_t selection, uint32_t* device_idx)
+{
+    if ( size[type] <= selection || selection < 0 ) return vde_InvalidSelection;
+
+    lock;
+
+    uint32_t i, temp_idx = -1;
+
+    for (i = 0; i < MAX_DEVICES; ++i) {
+        if ( !video_devices_running[type][i] ) {
+            temp_idx = i;
+            break;
+        }
+    }
+
+    if (temp_idx == -1) {
+        unlock;
+        return vde_AllDevicesBusy;
+    }
+
+    for (i = 0; i < MAX_DEVICES; i ++) { /* Check if any device has the same selection */
+        if ( video_devices_running[type][i] && video_devices_running[type][i]->selection == selection ) {
+
+            video_devices_running[type][temp_idx] = video_devices_running[type][i];
+            video_devices_running[type][i]->ref_count++;
+
+            unlock;
+            return vde_None;
+        }
+    }
+
+    VideoDevice* device = video_devices_running[type][temp_idx] = calloc(1, sizeof(VideoDevice));
+    device->selection = selection;
+
+    if ( pthread_mutex_init(device->mutex, NULL) != 0 ) {
+        free(device);
+        unlock;
+        return vde_InternalError;
+    }
+
+    if ( type == vdt_input ) {
+        video_thread_paused = true;
+
+#if defined(__linux__) || defined(__FreeBSD__)
+        /* Open selected device */
+        char device_address[] = "/dev/videoXX";
+        snprintf(device_address + 10 , sizeof(device_address) - 10, "%i", selection);
+
+        device->fd = open(device_address, O_RDWR);
+        if ( device->fd == -1 ) {
+            unlock;
+            return vde_FailedStart;
+        }
+
+        /* Obtain video device capabilities */
+        struct v4l2_capability cap;
+        if ( -1 == xioctl(device->fd, VIDIOC_QUERYCAP, &cap) ) {
+            close(device->fd);
+            free(device);
+            unlock;
+            return vde_FailedStart;
+        }
+
+        /* Setup video format */
+        struct v4l2_format fmt;
+        memset(&(fmt), 0, sizeof(fmt));
+
+        fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
+        if( -1 == xioctl(device->fd, VIDIOC_G_FMT, &fmt) ) {
+            close(device->fd);
+            free(device);
+            unlock;
+            return vde_FailedStart;
+        }
+
+        device->video_width = fmt.fmt.pix.width;
+        device->video_height = fmt.fmt.pix.height;
+
+        /* Request buffers */
+        struct v4l2_requestbuffers req;
+        memset(&(req), 0, sizeof(req));
+        req.count = 4;
+        req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        req.memory = V4L2_MEMORY_MMAP;
+        if ( -1 == xioctl(device->fd, VIDIOC_REQBUFS, &req) ) {
+            close(device->fd);
+            free(device);
+            unlock;
+            return vde_FailedStart;
+        }
+
+        if ( req.count < 2 ) {
+            close(device->fd);
+            free(device);
+            unlock;
+            return vde_FailedStart;
+        }
+
+        device->buffers = calloc(req.count, sizeof(struct VideoBuffer));
+
+        for (i = 0; i < req.count; ++i) {
+            struct v4l2_buffer buf;
+            memset(&(buf), 0, sizeof(buf));
+
+            buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+            buf.memory = V4L2_MEMORY_MMAP;
+            buf.index = i;
+
+            if ( -1 == xioctl(device->fd, VIDIOC_QUERYBUF, &buf) ) {
+                close(device->fd);
+                free(device);
+                unlock;
+                return vde_FailedStart;
+            }
+
+            device->buffers[i].length = buf.length;
+            device->buffers[i].start = mmap(NULL /* start anywhere */,
+                          buf.length,
+                          PROT_READ | PROT_WRITE /* required */,
+                          MAP_SHARED /* recommended */,
+                          device->fd, buf.m.offset);
+
+            if ( MAP_FAILED == device->buffers[i].start ) {
+                for (i = 0; i < buf.index; ++i)
+                    munmap(device->buffers[i].start, device->buffers[i].length);
+                close(device->fd);
+                free(device);
+                unlock;
+                return vde_FailedStart;
+            }
+        }
+        device->n_buffers = i;
+
+        enum v4l2_buf_type type;
+
+        for (i = 0; i < device->n_buffers; ++i) {
+            struct v4l2_buffer buf;
+            memset(&(buf), 0, sizeof(buf));
+
+            buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+            buf.memory = V4L2_MEMORY_MMAP;
+            buf.index = i;
+
+            if ( -1 == xioctl(device->fd, VIDIOC_QBUF, &buf) ) {
+                for (i = 0; i < device->n_buffers; ++i)
+                    munmap(device->buffers[i].start, device->buffers[i].length);
+                close(device->fd);
+                free(device);
+                unlock;
+                return vde_FailedStart;
+            }
+        }
+
+        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+        /* Turn on video stream */
+        if ( -1 == xioctl(device->fd, VIDIOC_STREAMON, &type) ) {
+            close_video_device(vdt_input, temp_idx);
+            unlock;
+            return vde_FailedStart;
+        }
+
+#else /* __OSX__ */
+        if ( osx_video_open_device(selection, &device->video_width, &device->video_height) != 0 ) {
+            free(device);
+            unlock;
+            return vde_FailedStart;
+        }
+#endif
+
+        /* Create X11 window associated to device */
+        if ( (device->x_display = XOpenDisplay(NULL)) == NULL ) {
+            close_video_device(vdt_input, temp_idx);
+            unlock;
+            return vde_FailedStart;
+        }
+
+        int screen = DefaultScreen(device->x_display);
+
+        if ( !(device->x_window = XCreateSimpleWindow(device->x_display, RootWindow(device->x_display, screen), 0, 0,
+                    device->video_width, device->video_height, 0, BlackPixel(device->x_display, screen),
+                    BlackPixel(device->x_display, screen))) ) {
+            close_video_device(vdt_input, temp_idx);
+            unlock;
+            return vde_FailedStart;
+        }
+
+        XStoreName(device->x_display, device->x_window, "Video Preview");
+        XSelectInput(device->x_display, device->x_window, ExposureMask|ButtonPressMask|KeyPressMask);
+
+        if ( (device->x_gc = DefaultGC(device->x_display, screen)) == NULL ) {
+            close_video_device(vdt_input, temp_idx);
+            unlock;
+            return vde_FailedStart;
+        }
+
+        /* Disable user from manually closing the X11 window */
+        Atom wm_delete_window = XInternAtom(device->x_display, "WM_DELETE_WINDOW", false);
+        XSetWMProtocols(device->x_display, device->x_window, &wm_delete_window, 1);
+
+        XMapWindow(device->x_display, device->x_window);
+        XClearWindow(device->x_display, device->x_window);
+        XMapRaised(device->x_display, device->x_window);
+        XFlush(device->x_display);
+
+        vpx_img_alloc(&device->input, VPX_IMG_FMT_I420, device->video_width, device->video_height, 1);
+
+        video_thread_paused = false;
+    } else { /* vdt_output */
+
+        /* Create X11 window associated to device */
+        if ( (device->x_display = XOpenDisplay(NULL)) == NULL ) {
+            close_video_device(vdt_output, temp_idx);
+            unlock;
+            return vde_FailedStart;
+        }
+
+        int screen = DefaultScreen(device->x_display);
+
+        if ( !(device->x_window = XCreateSimpleWindow(device->x_display, RootWindow(device->x_display, screen), 0, 0,
+                    100, 100, 0, BlackPixel(device->x_display, screen), BlackPixel(device->x_display, screen))) ) {
+            close_video_device(vdt_output, temp_idx);
+            unlock;
+            return vde_FailedStart;
+        }
+
+        XStoreName(device->x_display, device->x_window, "Video Receive");
+        XSelectInput(device->x_display, device->x_window, ExposureMask|ButtonPressMask|KeyPressMask);
+
+        if ( (device->x_gc = DefaultGC(device->x_display, screen)) == NULL ) {
+            close_video_device(vdt_output, temp_idx);
+            unlock;
+            return vde_FailedStart;
+        }
+
+        /* Disable user from manually closing the X11 window */
+        Atom wm_delete_window = XInternAtom(device->x_display, "WM_DELETE_WINDOW", false);
+        XSetWMProtocols(device->x_display, device->x_window, &wm_delete_window, 1);
+
+        XMapWindow(device->x_display, device->x_window);
+        XClearWindow(device->x_display, device->x_window);
+        XMapRaised(device->x_display, device->x_window);
+        XFlush(device->x_display);
+
+        vpx_img_alloc(&device->input, VPX_IMG_FMT_I420, device->video_width, device->video_height, 1);
+    }
+
+    *device_idx = temp_idx;
+    unlock;
+
+    return vde_None;
+}
+
+__inline VideoDeviceError write_video_out(uint16_t width, uint16_t height,
+                                          uint8_t const *y, uint8_t const *u, uint8_t const *v,
+                                          int32_t ystride, int32_t ustride, int32_t vstride,
+                                          void *user_data)
+{
+    VideoDevice* device = video_devices_running[vdt_output][0];
+
+    if ( !device ) return vde_DeviceNotActive;
+
+    if( !device->x_window ) return vde_DeviceNotActive;
+
+    pthread_mutex_lock(device->mutex);
+
+    /* Resize X11 window to correct size */
+    if ( device->video_width != width || device->video_height != height ) {
+        device->video_width = width;
+        device->video_height = height;
+        XResizeWindow(device->x_display, device->x_window, width, height);
+
+        vpx_img_free(&device->input);
+        vpx_img_alloc(&device->input, VPX_IMG_FMT_I420, width, height, 1);
+    }
+
+    /* Convert YUV420 data to BGR */
+    ystride = abs(ystride);
+    ustride = abs(ustride);
+    vstride = abs(vstride);
+    uint8_t *img_data = malloc(width * height * 4);
+    yuv420tobgr(width, height, y, u, v, ystride, ustride, vstride, img_data);
+
+    /* Allocate image data in X11 */
+    XImage image = {
+        .width = width,
+        .height = height,
+        .depth = 24,
+        .bits_per_pixel = 32,
+        .format = ZPixmap,
+        .byte_order = LSBFirst,
+        .bitmap_unit = 8,
+        .bitmap_bit_order = LSBFirst,
+        .bytes_per_line = width * 4,
+        .red_mask = 0xFF0000,
+        .green_mask = 0xFF00,
+        .blue_mask = 0xFF,
+        .data = (char*)img_data
+    };
+
+    /* Render image data */
+    Pixmap pixmap = XCreatePixmap(device->x_display, device->x_window, width, height, 24);
+    XPutImage(device->x_display, pixmap, device->x_gc, &image, 0, 0, 0, 0, width, height);
+    XCopyArea(device->x_display, pixmap, device->x_window, device->x_gc, 0, 0, width, height, 0, 0);
+    XFreePixmap(device->x_display, pixmap);
+    XFlush(device->x_display);
+    free(img_data);
+
+    pthread_mutex_unlock(device->mutex);
+    return vde_None;
+}
+
+void* video_thread_poll (void* arg) // TODO: maybe use thread for every input source
+{
+    /*
+     * NOTE: We only need to poll input devices for data.
+     */
+    (void)arg;
+    uint32_t i;
+
+    while (video_thread_running)
+    {
+        if ( video_thread_paused ) usleep(10000); /* Wait for unpause. */
+        else
+        {
+            for (i = 0; i < size[vdt_input]; ++i)
+             {
+                lock;
+                if ( video_devices_running[vdt_input][i] != NULL )
+                {
+                    /* Obtain frame image data from device buffers */
+                    VideoDevice* device = video_devices_running[vdt_input][i];
+                    uint16_t video_width = device->video_width;
+                    uint16_t video_height = device->video_height;
+                    uint8_t *y = device->input.planes[0];
+                    uint8_t *u = device->input.planes[1];
+                    uint8_t *v = device->input.planes[2];
+
+#if defined(__linux__) || defined(__FreeBSD__)
+                    struct v4l2_buffer buf;
+                    memset(&(buf), 0, sizeof(buf));
+
+                    buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                    buf.memory = V4L2_MEMORY_MMAP;
+
+                    if ( -1 == ioctl(device->fd, VIDIOC_DQBUF, &buf) ) {
+                        unlock;
+                        continue;
+                    }
+
+                    void *data = (void*)device->buffers[buf.index].start;
+
+                    /* Convert frame image data to YUV420 for ToxAV */
+                    yuv422to420(y, u, v, data, video_width, video_height);
+
+#else /* __OSX__*/
+                    if ( osx_video_read_device(y, u, v, &video_width, &video_height) != 0 ) {
+                        unlock;
+                        continue;
+                    }
+#endif
+
+                    /* Send frame data to friend through ToxAV */
+                    if ( device->cb )
+                        device->cb(video_width, video_height, y, u, v, device->cb_data);
+
+                    /* Convert YUV420 data to BGR */
+                    uint8_t *img_data = malloc(video_width * video_height * 4);
+                    yuv420tobgr(video_width, video_height, y, u, v,
+                                video_width, video_width/2, video_width/2, img_data);
+
+                    /* Allocate image data in X11 */
+                    XImage image = {
+                        .width = video_width,
+                        .height = video_height,
+                        .depth = 24,
+                        .bits_per_pixel = 32,
+                        .format = ZPixmap,
+                        .byte_order = LSBFirst,
+                        .bitmap_unit = 8,
+                        .bitmap_bit_order = LSBFirst,
+                        .bytes_per_line = video_width * 4,
+                        .red_mask = 0xFF0000,
+                        .green_mask = 0xFF00,
+                        .blue_mask = 0xFF,
+                        .data = (char*)img_data
+                    };
+
+                    /* Render image data */
+                    Pixmap pixmap = XCreatePixmap(device->x_display, device->x_window, video_width, video_height, 24);
+                    XPutImage(device->x_display, pixmap, device->x_gc, &image, 0, 0, 0, 0, video_width, video_height);
+                    XCopyArea(device->x_display, pixmap, device->x_window, device->x_gc, 0, 0, video_width, video_height, 0, 0);
+                    XFreePixmap(device->x_display, pixmap);
+                    XFlush(device->x_display);
+                    free(img_data);
+
+#if defined(__linux__) || defined(__FreeBSD__)
+                    if ( -1 == xioctl(device->fd, VIDIOC_QBUF, &buf) ) {
+                        unlock;
+                        continue;
+                    }
+#endif /* __linux__ */
+
+                }
+                unlock;
+            }
+            usleep(1000 * 1000 / 24);
+        }
+    }
+
+    pthread_exit(NULL);
+}
+
+VideoDeviceError close_video_device(VideoDeviceType type, uint32_t device_idx)
+{
+    if ( device_idx >= MAX_DEVICES ) return vde_InvalidSelection;
+
+    lock;
+    VideoDevice *device = video_devices_running[type][device_idx];
+    VideoDeviceError rc = vde_None;
+
+    if ( !device ) {
+        unlock;
+        return vde_DeviceNotActive;
+    }
+
+    video_devices_running[type][device_idx] = NULL;
+
+    if ( !device->ref_count ) {
+
+        if ( type == vdt_input ) {
+#if defined(__linux__) || defined(__FreeBSD__)
+            enum v4l2_buf_type buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+            if( -1 == xioctl(device->fd, VIDIOC_STREAMOFF, &buf_type) ) {}
+
+            int i;
+            for (i = 0; i < device->n_buffers; ++i) {
+                if ( -1 == munmap(device->buffers[i].start, device->buffers[i].length) ) {
+                }
+            }
+            close(device->fd);
+
+#else /* __OSX__ */
+            osx_video_close_device(device_idx);
+#endif
+            vpx_img_free(&device->input);
+            XDestroyWindow(device->x_display, device->x_window);
+            XFlush(device->x_display);
+            XCloseDisplay(device->x_display);
+            pthread_mutex_destroy(device->mutex);
+
+#if defined(__linux__) || defined(__FreeBSD__)
+            free(device->buffers);
+#endif /* __linux__ */
+
+            free(device);
+        } else {
+            vpx_img_free(&device->input);
+            XDestroyWindow(device->x_display, device->x_window);
+            XFlush(device->x_display);
+            XCloseDisplay(device->x_display);
+            pthread_mutex_destroy(device->mutex);
+            free(device);
+        }
+
+    }
+    else device->ref_count--;
+
+    unlock;
+    return rc;
+}
+
+void print_video_devices(ToxWindow* self, VideoDeviceType type)
+{
+    int i;
+
+    for (i = 0; i < size[type]; ++i)
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "%d: %s", i, video_devices_names[type][i]);
+
+    return;
+}
+
+VideoDeviceError video_selection_valid(VideoDeviceType type, int32_t selection)
+{
+    return (size[type] <= selection || selection < 0) ? vde_InvalidSelection : vde_None;
+}

src/video_device.h

@@ -0,0 +1,76 @@
+/*  video_device.h
+ *
+ *
+ *  Copyright (C) 2014 Toxic All Rights Reserved.
+ *
+ *  This file is part of Toxic.
+ *
+ *  Toxic 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.
+ *
+ *  Toxic 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 Toxic.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef VIDEO_DEVICE_H
+#define VIDEO_DEVICE_H
+
+#define MAX_DEVICES 32
+#include <inttypes.h>
+#include "windows.h"
+
+typedef enum VideoDeviceType {
+    vdt_input,
+    vdt_output,
+} VideoDeviceType;
+
+typedef enum VideoDeviceError {
+    vde_None,
+    vde_InternalError = -1,
+    vde_InvalidSelection = -2,
+    vde_FailedStart = -3,
+    vde_Busy = -4,
+    vde_AllDevicesBusy = -5,
+    vde_DeviceNotActive = -6,
+    vde_BufferError = -7,
+    vde_UnsupportedMode = -8,
+    vde_CaptureError = -9,
+} VideoDeviceError;
+
+typedef void (*VideoDataHandleCallback) (int16_t width, int16_t height, const uint8_t* y, const uint8_t* u, const uint8_t* v, void* data);
+
+#ifdef VIDEO
+VideoDeviceError init_video_devices(ToxAV* av);
+#else
+VideoDeviceError init_video_devices();
+#endif /* VIDEO */
+
+VideoDeviceError terminate_video_devices();
+
+/* Callback handles ready data from INPUT device */
+VideoDeviceError register_video_device_callback(int32_t call_idx, uint32_t device_idx, VideoDataHandleCallback callback, void* data);
+void* get_video_device_callback_data(uint32_t device_idx);
+
+VideoDeviceError set_primary_video_device(VideoDeviceType type, int32_t selection);
+VideoDeviceError open_primary_video_device(VideoDeviceType type, uint32_t* device_idx);
+/* Start device */
+VideoDeviceError open_video_device(VideoDeviceType type, int32_t selection, uint32_t* device_idx);
+/* Stop device */
+VideoDeviceError close_video_device(VideoDeviceType type, uint32_t device_idx);
+
+/* Write data to device */
+VideoDeviceError write_video_out(uint16_t width, uint16_t height, uint8_t const *y, uint8_t const *u, uint8_t const *v, int32_t ystride, int32_t ustride, int32_t vstride, void *user_data);
+
+void print_video_devices(ToxWindow* self, VideoDeviceType type);
+void get_primary_video_device_name(VideoDeviceType type, char *buf, int size);
+
+VideoDeviceError video_selection_valid(VideoDeviceType type, int32_t selection);
+#endif /* VIDEO_DEVICE_H */

src/windows.c

@@ -400,6 +400,9 @@ void on_window_resize(void)
     getmaxyx(stdscr, y2, x2);
     y2 -= 2;
 
+    if (y2 <= 0 || x2 <= 0)
+        return;
+
     size_t i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {

src/windows.h

@@ -76,7 +76,7 @@ struct cqueue_thread {
     pthread_t tid;
 };
 
-struct audio_thread {
+struct av_thread {
     pthread_t tid;
 };
 
@@ -90,7 +90,7 @@ struct arg_opts {
     bool encrypt_data;
     bool unencrypt_data;
 
-    char dns_path[MAX_STR_SIZE];
+    char nameserver_path[MAX_STR_SIZE];
     char config_path[MAX_STR_SIZE];
     char nodes_path[MAX_STR_SIZE];
 
@@ -135,24 +135,27 @@ struct ToxWindow {
 
 #ifdef AUDIO
 
-    void(*onInvite)(ToxWindow *, ToxAv *, int);
-    void(*onRinging)(ToxWindow *, ToxAv *, int);
-    void(*onStarting)(ToxWindow *, ToxAv *, int);
-    void(*onEnding)(ToxWindow *, ToxAv *, int);
-    void(*onError)(ToxWindow *, ToxAv *, int);
-    void(*onStart)(ToxWindow *, ToxAv *, int);
-    void(*onCancel)(ToxWindow *, ToxAv *, int);
-    void(*onReject)(ToxWindow *, ToxAv *, int);
-    void(*onEnd)(ToxWindow *, ToxAv *, int);
-    void(*onRequestTimeout)(ToxWindow *, ToxAv *, int);
-    void(*onPeerTimeout)(ToxWindow *, ToxAv *, int);
-    void(*onWriteDevice)(ToxWindow *, Tox *, int, int, const int16_t *, unsigned int, uint8_t, unsigned int);
+    void(*onInvite)(ToxWindow *, ToxAV *, uint32_t, int);
+    void(*onRinging)(ToxWindow *, ToxAV *, uint32_t, int);
+    void(*onStarting)(ToxWindow *, ToxAV *, uint32_t, int);
+    void(*onEnding)(ToxWindow *, ToxAV *, uint32_t, int);
+    void(*onError)(ToxWindow *, ToxAV *, uint32_t, int);
+    void(*onStart)(ToxWindow *, ToxAV *, uint32_t, int);
+    void(*onCancel)(ToxWindow *, ToxAV *, uint32_t, int);
+    void(*onReject)(ToxWindow *, ToxAV *, uint32_t, int);
+    void(*onEnd)(ToxWindow *, ToxAV *, uint32_t, int);
+    void(*onWriteDevice)(ToxWindow *, Tox *, uint32_t, int, const int16_t *, unsigned int, uint8_t, unsigned int);
 
-    int call_idx; /* If in a call will have this index set, otherwise it's -1.
-                   * Don't modify outside av callbacks. */
     int device_selection[2]; /* -1 if not set, if set uses these selections instead of primary device */
-
+    bool is_call;
     int ringing_sound;
+
+#ifdef VIDEO
+
+    int video_device_selection[2]; /* -1 if not set, if set uses these selections instead of primary video device */
+    
+#endif /* VIDEO */
+
 #endif /* AUDIO */
 
     int active_box; /* For box notify */