.cirrus.yml

@@ -1,12 +0,0 @@
----
-bazel-opt_task:
-  container:
-    image: toxchat/toktok-stack:latest-release
-    cpu: 2
-    memory: 2G
-  configure_script:
-    - /src/workspace/tools/inject-repo toxic
-  test_all_script:
-    - cd /src/workspace && bazel test -k
-        --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
-        //toxic/...

.github/CODEOWNERS

@@ -1 +0,0 @@
-/.github/	@TokTok/admins

.github/FUNDING.yml

@@ -1,2 +0,0 @@
----
-github: [JFreegman]

.github/settings.yml

@@ -1,19 +0,0 @@
----
-_extends: .github
-
-repository:
-  name: toxic
-  description: An ncurses-based Tox client
-  topics: tox, console, chat
-
-branches:
-  - name: "master"
-    protection:
-      required_status_checks:
-        contexts:
-          - build
-          - build-static
-          - bazel-opt
-          - Codacy Static Code Analysis
-          - code-review/reviewable
-          - infer

.github/workflows/ci.yml

@@ -1,125 +0,0 @@
-name: ci
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run:
-          sudo apt-get update &&
-          sudo apt-get install -y --no-install-recommends
-            libalut-dev
-            libconfig-dev
-            libcurl4-gnutls-dev
-            libmsgpack-dev
-            libnotify-dev
-            libopenal-dev
-            libopus-dev
-            libqrencode-dev
-            libsodium-dev
-            libvpx-dev
-            libx11-dev
-            python3-dev
-            pkg-config &&
-          git clone --depth=1 --recursive https://github.com/TokTok/c-toxcore &&
-          cd c-toxcore &&
-          cmake . -B_build -DBOOTSTRAP_DAEMON=OFF &&
-          cd _build &&
-          make -j4 &&
-          sudo make install
-
-      - name: Build toxic
-        run: make -j4
-
-  build-static:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Build minimal static toxic binary
-        run: docker run --rm
-          -v /tmp/artifact:/artifact
-          -v $PWD:/toxic
-          amd64/alpine:latest
-          sh -c 'yes | /toxic/script/build-minimal-static-toxic.sh'
-      - name: Display binary checksum
-        run: |
-          tar Jxf /tmp/artifact/toxic-minimal-static-musl_linux_x86-64.tar.xz
-          sha256sum toxic-minimal-static-musl_linux_x86-64/toxic
-
-  infer:
-    runs-on: ubuntu-latest
-    container: toxchat/infer
-    steps:
-      - name: Install git
-        run:
-          apt-get update &&
-          DEBIAN_FRONTEND=noninteractive
-          apt-get install -y --no-install-recommends
-            git
-      - name: Install dependencies
-        run:
-          apt-get update &&
-          apt-get install -y --no-install-recommends
-            cmake
-            g++
-            libalut-dev
-            libconfig-dev
-            libcurl4-gnutls-dev
-            libmsgpack-dev
-            libncurses-dev
-            libnotify-dev
-            libopenal-dev
-            libopus-dev
-            libqrencode-dev
-            libsodium-dev
-            libvpx-dev
-            libx11-dev
-            make
-            python3-dev
-            pkg-config &&
-          git clone --depth=1 --recursive https://github.com/TokTok/c-toxcore &&
-          cd c-toxcore &&
-          cmake . -B_build -DBOOTSTRAP_DAEMON=OFF &&
-          cd _build &&
-          make -j4 &&
-          make install
-      - uses: actions/checkout@v2
-
-      - name: Run infer
-        run:
-          infer --no-progress-bar -- cc src/*.c
-            -fsyntax-only
-            $(python3-config --includes --ldflags)
-            $(pkg-config --cflags --libs
-              freealut
-              libconfig
-              libcurl
-              libnotify
-              libpng
-              libqrencode
-              msgpack
-              ncurses
-              openal
-              python3
-              toxcore
-              vpx
-              x11)
-            -DAUDIO
-            -DBOX_NOTIFY
-            -DGAMES
-            -DPACKAGE_DATADIR='""'
-            -DPYTHON
-            -DQRCODE
-            -DSOUND_NOTIFY
-            -DVIDEO
-      - name: Print log
-        run:
-          cat /__w/toxic/toxic/infer-out/report.txt

.gitignore

@@ -9,14 +9,19 @@
 *.app
 *.swp
 *.la
+m4/*
+!m4/pkg.m4
+configure
+configure_aux
+Makefile.in
+aclocal.m4
+config.h*
+config.log
+config.status
 stamp-h1
+autom4te.cache
 .deps
 .libs
 *.orig
 build/toxic
-build/*.o
-build/*.d
-apidoc/python/build
-*.vim
-*.tox
-*.nvim*
+Makefile

.restyled.yaml

@@ -1,4 +0,0 @@
----
-restylers:
-  - astyle:
-      arguments: ["--options=astylerc"]

.travis.yml

@@ -0,0 +1,64 @@
+language: c
+compiler:
+  - gcc
+  - clang
+
+before_script:
+  #installing libsodium, needed for Core
+  - git clone git://github.com/jedisct1/libsodium.git > /dev/null
+  - cd libsodium
+  - git checkout tags/0.4.2 > /dev/null
+  - ./autogen.sh > /dev/null
+  - ./configure > /dev/null
+  - make check -j3 > /dev/null
+  - sudo make install >/dev/null
+  - cd ..
+  #installing yasm, needed for compiling vpx
+  - sudo apt-get install yasm > /dev/null
+  #installing libconfig, needed for DHT_bootstrap_daemon
+  - wget http://www.hyperrealm.com/libconfig/libconfig-1.4.9.tar.gz > /dev/null
+  - tar -xvzf libconfig-1.4.9.tar.gz > /dev/null
+  - cd libconfig-1.4.9
+  - ./configure > /dev/null
+  - make -j3 > /dev/null
+  - sudo make install > /dev/null
+  - cd ..
+  #installing libopus, needed for audio encoding/decoding
+  - wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz > /dev/null
+  - tar xzf opus-1.0.3.tar.gz > /dev/null
+  - cd opus-1.0.3
+  - ./configure > /dev/null
+  - make -j3 > /dev/null
+  - sudo make install > /dev/null
+  - cd ..
+  #installing vpx
+  - git clone http://git.chromium.org/webm/libvpx.git > /dev/null
+  - cd libvpx
+  - ./configure --enable-shared > /dev/null
+  - make -j3 >/dev/null
+  - sudo make install > /dev/null
+  - cd ..
+  #creating libraries links and updating cache
+  - sudo ldconfig > /dev/null
+# creating librarys' links and updating cache
+  - sudo ldconfig
+  - git clone https://github.com/irungentoo/ProjectTox-Core.git toxcore
+  - cd toxcore
+  - autoreconf -i
+  - ./configure --disable-tests --disable-ntox --disable-daemon --enable-av
+  - make -j2
+  - sudo make install
+  - cd ..
+  - sudo apt-get install libopenal-dev -yq
+script:
+  - autoreconf -i
+  - ./configure
+  - make -j2
+notifications:
+  email: false
+
+  irc: 
+    channels:
+      - "chat.freenode.net#tox-dev"
+    on_success: always
+    on_failure: always

AUTHORS

@@ -0,0 +1 @@
+See github contributors

BUILD.bazel

@@ -1,52 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_binary")
-load("//tools/project:build_defs.bzl", "project")
-
-package(features = ["layering_check"])
-
-project()
-
-cc_binary(
-    name = "toxic",
-    srcs = glob(
-        [
-            "src/*.c",
-            "src/*.h",
-        ],
-        exclude = ["src/video*"],
-    ) + select({
-        "//tools/config:linux": glob(["src/video*"]),
-        "//tools/config:osx": [],
-    }),
-    copts = [
-        "-std=gnu99",
-        "-DAUDIO",
-        "-DGAMES",
-        "-DHAVE_WIDECHAR",
-        "-DPACKAGE_DATADIR='\"data\"'",
-        "-DPYTHON",
-        "-DQRCODE",
-    ] + select({
-        "//tools/config:linux": ["-DVIDEO"],
-        "//tools/config:osx": [],
-    }),
-    deps = [
-        "//c-toxcore",
-        "@curl",
-        "@libconfig",
-        "@libqrencode",
-        "@libvpx",
-        "@ncurses",
-        "@openal",
-        "@python3//:python",
-    ] + select({
-        "//tools/config:linux": ["@x11"],
-        "//tools/config:osx": [],
-    }),
-)
-
-sh_test(
-    name = "toxic_test",
-    size = "small",
-    srcs = [":toxic"],
-    args = ["--help"],
-)

COPYING

@@ -672,4 +672,3 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
-

INSTALL

@@ -0,0 +1,365 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

INSTALL.md

@@ -1,71 +0,0 @@
-# Installation
-* [Dependencies](#dependencies)
-  * [OS X Notes](#os-x-notes)
-* [Compiling](#compiling)
-  * [Documentation](#documentation)
-* [Notes](#notes)
-  * [Compilation variables](#compilation-variables)
-  * [Environment variables](#environment-variables)
-
-## Dependencies
-| Name                                                 | Needed by                  | Debian package      |
-|------------------------------------------------------|----------------------------|---------------------|
-| [Tox Core](https://github.com/toktok/c-toxcore)      | BASE                       | libtoxcore-dev      |
-| [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/)   | QRCODE                     | libqrencode-dev     |
-| [OpenAL](http://openal.org)                          | AUDIO, SOUND NOTIFICATIONS | libopenal-dev       |
-| [OpenALUT](http://openal.org)                        | SOUND NOTIFICATIONS        | libalut-dev         |
-| [LibNotify](https://developer.gnome.org/libnotify)   | DESKTOP NOTIFICATIONS      | libnotify-dev       |
-| [Python 3](http://www.python.org/)                   | PYTHON                     | python3-dev         |
-| [AsciiDoc](http://asciidoc.org/index.html)           | DOCUMENTATION<sup>1</sup>  | asciidoc            |
-
-<sup>1</sup>: see [Documentation](#documentation)
-
-#### OS X Notes
-Using [Homebrew](http://brew.sh):
-```
-brew install curl qrencode openal-soft freealut libconfig libpng
-brew install --HEAD https://raw.githubusercontent.com/Tox/homebrew-tox/master/Formula/libtoxcore.rb
-brew install libnotify
-export PKG_CONFIG_PATH=/usr/local/opt/openal-soft/lib/pkgconfig
-make
-```
-
-You can omit `libnotify` if you intend to build without desktop notifications enabled.
-
-## Compiling
-```
-make
-sudo make install
-```
-
-#### Documentation
-Run `make doc` in the build directory after editing the asciidoc files to regenerate the manpages.<br />
-**Note for developers**: asciidoc files and generated manpages will need to be committed together.<br />
-**Note for everyone**: [asciidoc](http://asciidoc.org/index.html) (and this step) is only required for regenerating manpages when you modify them.
-
-## Notes
-
-#### Compilation variables
-* You can add specific flags to the Makefile with `USER_CFLAGS=""` and `USER_LDFLAGS=""` passed as arguments to make, or as environment variables
-* Default compile options can be overridden by using special variables:
-  * `DISABLE_X11=1` → Disable X11 support (needed for focus tracking)
-  * `DISABLE_AV=1` → Disable audio call support
-  * `DISABLE_SOUND_NOTIFY=1` → Disable sound notifications support
-  * `DISABLE_QRCODE=1` → Disable QR exporting support
-  * `DISABLE_QRPNG=1` → Disable support for exporting QR as PNG
-  * `DISABLE_DESKTOP_NOTIFY=1` → Disable desktop notifications support
-  * `DISABLE_GAMES=1` → Disable support for games
-  * `ENABLE_PYTHON=1` → Build toxic with Python scripting support
-  * `ENABLE_RELEASE=1` → Build toxic without debug symbols and with full compiler optimizations
-  * `ENABLE_ASAN=1` → Build toxic with LLVM Address Sanitizer enabled
-
-* `DESTDIR=""` Specifies the base install directory for binaries and data files (e.g.: DESTDIR="/tmp/build/pkg")
-
-#### Environment variables
-* You can use the `CFLAGS` and `LDFLAGS` environment variables to add specific flags to the Makefile
-* The `PREFIX` environment variable specifies a base install directory for binaries and data files. This is interchangeable with the `DESTDIR` variable, and is generally used by systems that have the `PREFIX` environment variable set by default.<br />
-**Note**: `sudo` does not preserve user environment variables by default on some systems. See the `sudoers` manual for more information.

Makefile

@@ -1,97 +0,0 @@
-BASE_DIR = $(shell pwd -P)
-CFG_DIR = $(BASE_DIR)/cfg
-
--include $(CFG_DIR)/global_vars.mk
-
-LIBS = toxcore ncursesw libconfig libcurl
-
-CFLAGS ?= -std=c99 -pthread -Wall -Wpedantic -Wunused -fstack-protector-all -Wvla -Wno-missing-braces
-CFLAGS += '-DTOXICVER="$(VERSION)"' -DHAVE_WIDECHAR -D_XOPEN_SOURCE_EXTENDED -D_FILE_OFFSET_BITS=64
-CFLAGS += '-DPACKAGE_DATADIR="$(abspath $(DATADIR))"'
-CFLAGS += ${USER_CFLAGS}
-LDFLAGS ?=
-LDFLAGS += ${USER_LDFLAGS}
-
-OBJ = autocomplete.o avatars.o bootstrap.o chat.o chat_commands.o conference.o configdir.o curl_util.o execute.o
-OBJ += file_transfers.o friendlist.o global_commands.o conference_commands.o groupchats.o groupchat_commands.o help.o
-OBJ += input.o line_info.o log.o message_queue.o misc_tools.o name_lookup.o notify.o prompt.o qr_code.o settings.o
-OBJ += term_mplex.o toxic.o toxic_strings.o windows.o
-
-# Check if debug build is enabled
-RELEASE := $(shell if [ -z "$(ENABLE_RELEASE)" ] || [ "$(ENABLE_RELEASE)" = "0" ] ; then echo disabled ; else echo enabled ; fi)
-ifneq ($(RELEASE), enabled)
-	CFLAGS += -O0 -g -DDEBUG
-	LDFLAGS += -O0
-else
-	CFLAGS += -O2 -flto
-	LDFLAGS += -O2 -flto
-endif
-
-# Check if LLVM Address Sanitizer is enabled
-ASAN := $(shell if [ -z "$(ENABLE_ASAN)" ] || [ "$(ENABLE_ASAN)" = "0" ] ; then echo disabled ; else echo enabled ; fi)
-ifneq ($(ASAN), disabled)
-	CFLAGS += -fsanitize=address -fno-omit-frame-pointer
-endif
-
-# Check on wich system we are running
-UNAME_S = $(shell uname -s)
-ifeq ($(UNAME_S), Linux)
-LDFLAGS += -ldl -lrt
-endif
-ifeq ($(UNAME_S), OpenBSD)
-LIBS := $(filter-out ncursesw, $(LIBS))
-LDFLAGS += -lncursesw
-endif
-ifeq ($(UNAME_S), NetBSD)
-LIBS := $(filter-out ncursesw, $(LIBS))
-LDFLAGS += -lncursesw
-endif
-ifeq ($(UNAME_S), Darwin)
-    -include $(CFG_DIR)/systems/Darwin.mk
-endif
-
-# Check on which platform we are running
-UNAME_M = $(shell uname -m)
-ifeq ($(UNAME_M), x86_64)
-    -include $(CFG_DIR)/platforms/x86_64.mk
-endif
-ifneq ($(filter %86, $(UNAME_M)),)
-    -include $(CFG_DIR)/platforms/x86.mk
-endif
-ifneq ($(filter arm%, $(UNAME_M)),)
-    -include $(CFG_DIR)/platforms/arm.mk
-endif
-
-# Include all needed checks
--include $(CFG_DIR)/checks/check_features.mk
-
-# Fix path for object files
-OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ))
-
-# Targets
-all: $(BUILD_DIR)/toxic
-
-$(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) ;\
-	fi
-	@echo "  CC    $(@:$(BUILD_DIR)/%=%)"
-	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/$*.o -c $(SRC_DIR)/$*.c
-	@$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c >$(BUILD_DIR)/$*.d
-
-clean:
-	rm -f $(BUILD_DIR)/*.d $(BUILD_DIR)/*.o $(BUILD_DIR)/toxic
-
--include $(BUILD_DIR)/$(OBJ:.o=.d)
-
--include $(CFG_DIR)/targets/*.mk
-
-.PHONY: clean all

Makefile.am

@@ -0,0 +1,3 @@
+SUBDIRS = build misc
+
+ACLOCAL_AMFLAGS = -I m4

README

@@ -0,0 +1 @@
+

README.md

@@ -1,27 +1,25 @@
-<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 messaging and video chat client.
-
-[![Toxic Screenshot](https://i.imgur.com/TwYA8L0.png "Toxic Home Screen")](https://i.imgur.com/TwYA8L0.png)
+# Toxic
 
+Toxic is an ncurses based instant messaging client for [Tox](http://tox.im) which formerly resided in the [Tox core repository](https://github.com/irungentoo/ProjectTox-Core) and is now available as a standalone program. It looks like [this](http://i.imgur.com/hL7WhVl.png).
 ## Installation
-[See the install instructions](/INSTALL.md)
+* Generate the configure script by running the ```autoreconf -i``` command.
 
-## Settings
-Running Toxic for the first time creates an empty file called toxic.conf in your home configuration directory ("~/.config/tox" for Linux users). Adding options to this file allows you to enable auto-logging, change the time format (12/24 hour), and much more.
-You can view our example config file [here](misc/toxic.conf.example).
+* Execute the configure script with ```./configure``` (you may need to pass it the location of your dependency libraries, i.e.):
+```./configure --prefix=/where/to/install --with-libtoxcore-headers=/path/to/ProjectTox-Core/toxcore --with-libtoxcore-libs=/path/to/ProjectTox-Core/build/.libs --with-libsodium-headers=/path/to/libsodium/include/ --with-libsodium-libs=/path/to/sodiumtest/lib/ ```
 
-## Troubleshooting
-If your default prefix is "/usr/local" and you receive the following:
-```
-error while loading shared libraries: libtoxcore.so.0: cannot open shared object file: No such file or directory
-```
-you can attempt to correct it by running `sudo ldconfig`. If that doesn't work, run:
+* Audio calling support requires openal installed
+* Compile with --disable-av to build without audio call support
+* Compile and install the program with ```make && sudo make install```
+
+#### Notes
+If your default prefix is /usr/local and you get the error: "error while loading shared libraries: libtoxcore.so.0: cannot open shared object file: No such file or directory", then you can try running ```sudo ldconfig```. If that doesn't fix it, run:
 ```
 echo '/usr/local/lib/' | sudo tee -a /etc/ld.so.conf.d/locallib.conf
 sudo ldconfig
 ```
-
+If you dont already have them, you may need to install the ncurses libraries. For Debian based systems:
+```
+sudo apt-get install libncurses5-dev libncursesw5-dev
+```
+## Settings
+After running Toxic for the first time an empty file called toxic.conf should reside in your home configuration directory (~/.config/tox for Linux users). For an example on how to use this config file to save settings such as auto-logging and time format see: toxic/misc/toxic.conf

apidoc/python/Makefile

@@ -1,20 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-SPHINXPROJ    = toxic_api
-SOURCEDIR     = source
-BUILDDIR      = build
-
-# Put it first so that "make" without argument is like "make help".
-help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

apidoc/python/source/conf.py

@@ -1,154 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# toxic_api documentation build configuration file, created by
-# sphinx-quickstart on Tue May 16 08:58:24 2017.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
-
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#
-# needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-#
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = 'toxic_api'
-copyright = '2017, Jakob Kreuze'
-author = 'Jakob Kreuze'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '0.12.0'
-# The full version, including alpha/beta/rc tags.
-release = '0.12.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = []
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#
-html_theme = 'alabaster'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#
-# html_theme_options = {}
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-
-# -- Options for HTMLHelp output ------------------------------------------
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'toxic_apidoc'
-
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #
-    # 'papersize': 'letterpaper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    #
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    #
-    # 'preamble': '',
-
-    # Latex figure (float) alignment
-    #
-    # 'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-    (master_doc, 'toxic_api.tex', 'toxic\\_api Documentation',
-     'Jakob Kreuze', 'manual'),
-]
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'toxic_api', 'toxic_api Documentation',
-     [author], 1)
-]
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-    (master_doc, 'toxic_api', 'toxic_api Documentation',
-     author, 'toxic_api', 'One line description of project.',
-     'Miscellaneous'),
-]

apidoc/python/source/examples.rst

@@ -1,8 +0,0 @@
-============
-API Examples
-============
-
-Fortune
-=======
-.. literalinclude:: fortune.py
-   :language: python

apidoc/python/source/fortune.py

@@ -1,37 +0,0 @@
-import toxic_api
-import random
-
-FORTUNES = [
-    "A bug in the code is worth two in the documentation.",
-    "A bug in the hand is better than one as yet undetected.",
-    "\"A debugged program is one for which you have not yet found the "
-    "conditions that make it fail.\" -- Jerry Ogdin"
-]
-
-def send_fortune(args):
-    """Callback function that sends the contact of the current window a
-    given number of random fortunes.
-    """
-    if len(args) != 1:
-        toxic_api.display("Only one argument allowed!")
-        return
-
-    try:
-        count = int(args[0])
-    except ValueError:
-        toxic_api.display("Argument must be a number!")
-        return
-
-    if count < 0 or count > 20:
-        toxic_api.display("Argument is too large!")
-        return
-
-    name = toxic_api.get_nick()
-
-    toxic_api.send("%s has decided to send you %d fortunes:" % (name, count))
-    for _ in range(count):
-        toxic_api.send(random.choice(FORTUNES))
-
-
-toxic_api.register("/fortune", "Send a fortune to the contact of the current "
-                   "window", send_fortune)

apidoc/python/source/index.rst

@@ -1,9 +0,0 @@
-Toxic Scripting Interface Documentation
-=======================================
-
-.. toctree::
-   :maxdepth: 2
-
-   intro
-   reference
-   examples

apidoc/python/source/intro.rst

@@ -1,12 +0,0 @@
-=========================
-Toxic Scripting Interface
-=========================
-
-A Python scripting interface to `Toxic <https://github.com/JFreegman/toxic>`_.
-
-
-Getting Started
-===============
-Toxic is compiled with Python support by default. To access the scripting interface, simply import "toxic_api" in your script.
-
-Scripts can be run by issuing "/run <path>" from toxic, or placing them in the "autorun_path" from your toxic configuration file.

apidoc/python/source/reference.rst

@@ -1,73 +0,0 @@
-=============
-API Reference
-=============
-
-Messages
-========
-.. function:: display(msg)
-
-   Display a message to the user through the current window.
-
-   :param msg: The message to display.
-   :type msg: string
-   :rtype: none
-
-.. function:: send(msg)
-
-   Send a message to the user specified by the currently open conversation.
-
-   :param msg: The message to display.
-   :type msg: string
-   :rtype: none
-
-
-State
-=====
-.. function:: get_nick()
-
-   Return the user's current nickname.
-
-   :rtype: string
-
-.. function:: get_status()
-
-   Return a string representing the user's current status. Can be either "online", "away", or "busy".
-
-   :rtype: string
-
-.. function:: get_status_message()
-
-   Return the user's current status message.
-
-   :rtype: string
-
-.. function:: get_all_friends()
-
-   Return a list of all the user's friends.
-
-   :rtype: list of (string, string) tuples containing the nickname followed by their public key
-
-
-Commands
-========
-.. function:: execute(command, class)
-
-   Executes the given command. The API exports three constants for the class parameter; GLOBAL_COMMAND, CHAT_COMMAND, and GROUPCHAT_COMMAND.
-
-   :param command: The command to execute.
-   :type command: string
-   :param class: The class of the command.
-   :type class: int
-   :rtype: none
-
-.. function:: register(command, help, callback)
-
-   Register a callback to be executed whenever command is run. The callback function will be called with one argument, a list of arguments from when the user calls the command.
-
-   :param command: The command to listen for.
-   :type command: string
-   :param help: A description of the command to be shown in the help menu.
-   :type help: string
-   :param callback: The function to be called.
-   :type callback: callable
-   :rtype: none

astylerc

@@ -1,26 +0,0 @@
-# Bracket Style Options
---style=kr
-
-# Tab Options
---indent=spaces=4
-
-# Indentation Options
---indent-switches
-
-# Padding Options
---pad-header
---break-blocks
---pad-oper
---unpad-paren
---align-pointer=name
---align-reference=name
-
-# Formatting Options
---add-brackets
---convert-tabs
---max-code-length=120
-
-# Other Options
---preserve-date
---formatted
---lineend=linux

build/Makefile.am

@@ -0,0 +1,69 @@
+#Don't change this unless needed, else you'll break stuff
+
+bin_PROGRAMS = toxic
+
+
+toxic_SOURCES = $(top_srcdir)/src/toxic.c \
+                $(top_srcdir)/src/toxic.h \
+                $(top_srcdir)/src/chat.h \
+                $(top_srcdir)/src/chat.c \
+                $(top_srcdir)/src/configdir.h \
+                $(top_srcdir)/src/configdir.c \
+                $(top_srcdir)/src/prompt.h \
+                $(top_srcdir)/src/prompt.c \
+                $(top_srcdir)/src/friendlist.h \
+                $(top_srcdir)/src/friendlist.c \
+                $(top_srcdir)/src/windows.c \
+                $(top_srcdir)/src/windows.h \
+                $(top_srcdir)/src/groupchat.c \
+                $(top_srcdir)/src/groupchat.h \
+                $(top_srcdir)/src/global_commands.c \
+                $(top_srcdir)/src/global_commands.h \
+                $(top_srcdir)/src/chat_commands.c \
+                $(top_srcdir)/src/chat_commands.h \
+                $(top_srcdir)/src/execute.c \
+                $(top_srcdir)/src/execute.h \
+                $(top_srcdir)/src/misc_tools.c \
+                $(top_srcdir)/src/misc_tools.h \
+                $(top_srcdir)/src/toxic_strings.c \
+                $(top_srcdir)/src/toxic_strings.h \
+                $(top_srcdir)/src/log.c \
+                $(top_srcdir)/src/log.h \
+                $(top_srcdir)/src/file_senders.c \
+                $(top_srcdir)/src/file_senders.h \
+                $(top_srcdir)/src/line_info.c \
+                $(top_srcdir)/src/line_info.h \
+                $(top_srcdir)/src/settings.c \
+                $(top_srcdir)/src/settings.h \
+                $(top_srcdir)/src/dns.c \
+                $(top_srcdir)/src/dns.h
+
+toxic_CFLAGS =  -I$(top_srcdir) \
+				  $(NCURSES_CFLAGS) \
+				  $(LIBSODIUM_CFLAGS) \
+				  $(LIBTOXCORE_CFLAGS) \
+				  $(PTHREAD_CFLAGS)
+
+toxic_CPPFLAGS = '-DTOXICVER="$(TOXIC_VERSION)"'
+
+toxic_LDADD =	$(LIBTOXCORE_LDFLAGS) \
+				$(LIBSODIUM_LDFLAGS) \
+				$(NCURSES_LIBS) \
+				$(LIBTOXCORE_LIBS) \
+				$(LIBSODIUM_LIBS) \
+                $(WINSOCK2_LIBS) \
+                $(PTHREAD_LIBS)
+
+
+# For audio support
+if BUILD_AV
+
+toxic_SOURCES += $(top_srcdir)/src/audio_call.c \
+                 $(top_srcdir)/src/audio_call.h
+
+toxic_CFLAGS += $(LIBTOXAV_CFLAGS) \
+		$(OPENAL_CFLAGS)
+		
+toxic_LDADD += $(LIBTOXAV_LIBS) \
+	       $(OPENAL_LIBS) 
+endif

cfg/checks/audio.mk

@@ -1,22 +0,0 @@
-# Variables for audio call support
-AUDIO_LIBS = openal
-AUDIO_CFLAGS = -DAUDIO
-ifneq (, $(findstring audio_device.o, $(OBJ)))
-    AUDIO_OBJ = audio_call.o
-else
-    AUDIO_OBJ = audio_call.o audio_device.o
-endif
-
-# Check if we can build audio support
-CHECK_AUDIO_LIBS := $(shell $(PKG_CONFIG) --exists $(AUDIO_LIBS) || echo -n "error")
-ifneq ($(CHECK_AUDIO_LIBS), error)
-    LIBS += $(AUDIO_LIBS)
-    LDFLAGS += -lm
-    CFLAGS += $(AUDIO_CFLAGS)
-    OBJ += $(AUDIO_OBJ)
-else ifneq ($(MAKECMDGOALS), clean)
-    MISSING_AUDIO_LIBS := $(shell for lib in $(AUDIO_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
-    $(warning WARNING -- Toxic will be compiled without audio support)
-    $(warning WARNING -- You need these libraries for audio support)
-    $(warning WARNING -- $(MISSING_AUDIO_LIBS))
-endif

cfg/checks/check_features.mk

@@ -1,72 +0,0 @@
-CHECKS_DIR = $(CFG_DIR)/checks
-
-# Check if we want build X11 support
-X11 := $(shell if [ -z "$(DISABLE_X11)" ] || [ "$(DISABLE_X11)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
-ifneq ($(X11), disabled)
-    -include $(CHECKS_DIR)/x11.mk
-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)/audio.mk
-endif
-
-# Check if we want build video support
-VIDEO := $(shell if [ -z "$(DISABLE_VI)" ] || [ "$(DISABLE_VI)" = "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 to build with game support
-GAMES := $(shell if [ -z "$(DISABLE_GAMES)" ] || [ "$(DISABLE_GAMES)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
-ifneq ($(GAMES), disabled)
-    -include $(CHECKS_DIR)/games.mk
-endif
-
-# Check if we want build sound notifications support
-SND_NOTIFY := $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
-ifneq ($(SND_NOTIFY), disabled)
-    -include $(CHECKS_DIR)/sound_notifications.mk
-endif
-
-# Check if we want build desktop notifications support
-DESK_NOTIFY := $(shell if [ -z "$(DISABLE_DESKTOP_NOTIFY)" ] || [ "$(DISABLE_DESKTOP_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
-ifneq ($(DESK_NOTIFY), disabled)
-    -include $(CHECKS_DIR)/desktop_notifications.mk
-endif
-
-# Check if we want build QR export support
-QR_CODE := $(shell if [ -z "$(DISABLE_QRCODE)" ] || [ "$(DISABLE_QRCODE)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
-ifneq ($(QR_CODE), disabled)
-    -include $(CHECKS_DIR)/qr.mk
-endif
-
-# Check if we want build QR exported as PNG support
-QR_PNG := $(shell if [ -z "$(DISABLE_QRPNG)" ] || [ "$(DISABLE_QRPNG)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
-ifneq ($(QR_PNG), disabled)
-    -include $(CHECKS_DIR)/qr_png.mk
-endif
-
-# Check if we want build Python scripting support
-PYTHON := $(shell if [ -z "$(ENABLE_PYTHON)" ] || [ "$(ENABLE_PYTHON)" = "0" ] ; then echo disabled ; else echo enabled ; fi)
-ifneq ($(PYTHON), disabled)
-    -include $(CHECKS_DIR)/python.mk
-endif
-
-# Check if we can build Toxic
-CHECK_LIBS := $(shell $(PKG_CONFIG) --exists $(LIBS) || echo -n "error")
-ifneq ($(CHECK_LIBS), error)
-    CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBS))
-    LDFLAGS += $(shell $(PKG_CONFIG) --libs $(LIBS))
-else ifneq ($(MAKECMDGOALS), clean)
-    MISSING_LIBS := $(shell for lib in $(LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
-    $(warning ERROR -- Cannot compile Toxic)
-    $(warning ERROR -- You need these libraries)
-    $(warning ERROR -- $(MISSING_LIBS))
-    $(error ERROR)
-endif

cfg/checks/desktop_notifications.mk

@@ -1,15 +0,0 @@
-# Variables for desktop notifications support
-DESK_NOTIFY_LIBS = libnotify
-DESK_NOTIFY_CFLAGS = -DBOX_NOTIFY
-
-# Check if we can build desktop notifications support
-CHECK_DESK_NOTIFY_LIBS := $(shell $(PKG_CONFIG) --exists $(DESK_NOTIFY_LIBS) || echo -n "error")
-ifneq ($(CHECK_DESK_NOTIFY_LIBS), error)
-    LIBS += $(DESK_NOTIFY_LIBS)
-    CFLAGS += $(DESK_NOTIFY_CFLAGS)
-else ifneq ($(MAKECMDGOALS), clean)
-    MISSING_DESK_NOTIFY_LIBS := $(shell for lib in $(DESK_NOTIFY_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
-    $(warning WARNING -- Toxic will be compiled without desktop notifications support)
-    $(warning WARNING -- You need these libraries for desktop notifications support)
-    $(warning WARNING -- $(MISSING_DESK_NOTIFY_LIBS))
-endif

cfg/checks/games.mk

@@ -1,5 +0,0 @@
-# Variables for game support
-GAMES_CFLAGS = -DGAMES
-GAMES_OBJ = game_base.o game_centipede.o game_chess.o game_life.o game_util.o game_snake.o
-CFLAGS += $(GAMES_CFLAGS)
-OBJ += $(GAMES_OBJ)

cfg/checks/python.mk

@@ -1,15 +0,0 @@
-# Variables for Python scripting support
-PYTHON3_LIBS = python3
-PYTHON_CFLAGS = -DPYTHON
-PYTHON_OBJ = api.o python_api.o
-
-# Check if we can build Python scripting support
-CHECK_PYTHON3_LIBS = $(shell $(PKG_CONFIG) --exists $(PYTHON3_LIBS) || echo -n "error")
-ifneq ($(CHECK_PYTHON3_LIBS), error)
-    LDFLAGS += $(shell python3-config --ldflags)
-    CFLAGS += $(PYTHON_CFLAGS) $(shell python3-config --includes)
-    OBJ += $(PYTHON_OBJ)
-else ifneq ($(MAKECMDGOALS), clean)
-    $(warning WARNING -- Toxic will be compiled without Python scripting support)
-    $(warning WARNING -- You need python3 installed for Python scripting support)
-endif

cfg/checks/qr.mk

@@ -1,15 +0,0 @@
-# Variables for QR export support
-QR_LIBS = libqrencode
-QR_CFLAGS = -DQRCODE
-
-# Check if we can build QR export support
-CHECK_QR_LIBS = $(shell pkg-config --exists $(QR_LIBS) || echo -n "error")
-ifneq ($(CHECK_QR_LIBS), error)
-    LIBS += $(QR_LIBS)
-    CFLAGS += $(QR_CFLAGS)
-else ifneq ($(MAKECMDGOALS), clean)
-    MISSING_QR_LIBS = $(shell for lib in $(QR_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
-    $(warning WARNING -- Toxic will be compiled without QR export support)
-    $(warning WARNING -- You need these libraries for QR export support)
-    $(warning WARNING -- $(MISSING_QR_LIBS))
-endif

cfg/checks/qr_png.mk

@@ -1,15 +0,0 @@
-# Variables for QR exported as PNG support
-PNG_LIBS = libpng
-PNG_CFLAGS = -DQRPNG
-
-# Check if we can build QR exported as PNG support
-CHECK_PNG_LIBS = $(shell pkg-config --exists $(PNG_LIBS) || echo -n "error")
-ifneq ($(CHECK_PNG_LIBS), error)
-    LIBS += $(PNG_LIBS)
-    CFLAGS += $(PNG_CFLAGS)
-else ifneq ($(MAKECMDGOALS), clean)
-    MISSING_PNG_LIBS = $(shell for lib in $(PNG_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
-    $(warning WARNING -- Toxic will be compiled without QR exported as PNG support)
-    $(warning WARNING -- You need these libraries for QR exported as PNG support)
-    $(warning WARNING -- $(MISSING_PNG_LIBS))
-endif

cfg/checks/sound_notifications.mk

@@ -1,21 +0,0 @@
-# Variables for sound notifications support
-SND_NOTIFY_LIBS = openal freealut
-SND_NOTIFY_CFLAGS = -DSOUND_NOTIFY
-ifneq (, $(findstring audio_device.o, $(OBJ)))
-    SND_NOTIFY_OBJ =
-else
-    SND_NOTIFY_OBJ = audio_device.o
-endif
-
-# Check if we can build sound notifications support
-CHECK_SND_NOTIFY_LIBS = $(shell $(PKG_CONFIG) --exists $(SND_NOTIFY_LIBS) || echo -n "error")
-ifneq ($(CHECK_SND_NOTIFY_LIBS), error)
-    LIBS += $(SND_NOTIFY_LIBS)
-    CFLAGS += $(SND_NOTIFY_CFLAGS)
-    OBJ += $(SND_NOTIFY_OBJ)
-else ifneq ($(MAKECMDGOALS), clean)
-    MISSING_SND_NOTIFY_LIBS = $(shell for lib in $(SND_NOTIFY_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
-    $(warning WARNING -- Toxic will be compiled without sound notifications support)
-    $(warning WARNING -- You need these libraries for sound notifications support)
-    $(warning WARNING -- $(MISSING_SND_NOTIFY_LIBS))
-endif

cfg/checks/video.mk

@@ -1,21 +0,0 @@
-# Variables for video call support
-VIDEO_LIBS = openal 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/checks/x11.mk

@@ -1,17 +0,0 @@
-# Variables for X11 support
-X11_LIBS = x11
-X11_CFLAGS = -DX11
-X11_OBJ = x11focus.o
-
-# Check if we can build X11 support
-CHECK_X11_LIBS = $(shell $(PKG_CONFIG) --exists $(X11_LIBS) || echo -n "error")
-ifneq ($(CHECK_X11_LIBS), error)
-    LIBS += $(X11_LIBS)
-    CFLAGS += $(X11_CFLAGS)
-    OBJ += $(X11_OBJ)
-else ifneq ($(MAKECMDGOALS), clean)
-    MISSING_X11_LIBS = $(shell for lib in $(X11_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done)
-    $(warning WARNING -- Toxic will be compiled without x11 support (needed for focus tracking and drag&drop support))
-    $(warning WARNING -- You need these libraries for x11 support)
-    $(warning WARNING -- $(MISSING_X11_LIBS))
-endif

cfg/global_vars.mk

@@ -1,33 +0,0 @@
-# Version
-TOXIC_VERSION = 0.12.0
-REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
-ifneq (, $(findstring error, $(REV)))
-    VERSION = $(TOXIC_VERSION)
-else
-    VERSION = $(TOXIC_VERSION)_r$(REV)
-endif
-
-# Project directories
-BUILD_DIR = $(BASE_DIR)/build
-DOC_DIR = $(BASE_DIR)/doc
-SRC_DIR = $(BASE_DIR)/src
-SND_DIR = $(BASE_DIR)/sounds
-MISC_DIR = $(BASE_DIR)/misc
-
-# Project files
-MANFILES = toxic.1 toxic.conf.5
-DATAFILES = nameservers toxic.conf.example
-DESKFILE = toxic.desktop
-SNDFILES = ToxicContactOnline.wav ToxicContactOffline.wav ToxicError.wav
-SNDFILES += ToxicRecvMessage.wav ToxicOutgoingCall.wav ToxicIncomingCall.wav
-SNDFILES += ToxicTransferComplete.wav ToxicTransferStart.wav
-
-# Install directories
-PREFIX ?= /usr/local
-BINDIR = $(PREFIX)/bin
-DATADIR = $(PREFIX)/share/toxic
-MANDIR ?= $(PREFIX)/share/man
-APPDIR = $(PREFIX)/share/applications
-
-# Platform tools
-PKG_CONFIG = pkg-config

cfg/platforms/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

cfg/systems/Darwin.mk

@@ -1,18 +0,0 @@
-# Special options for OS X
-# This assumes the use of Homebrew. Change the paths if using MacPorts or Fink.
-
-PKG_CONFIG_PATH = $(shell export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/opt/libconfig/lib/pkgconfig:/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig)
-
-LIBS := $(filter-out ncursesw, $(LIBS))
-
-# OS X ships a usable, recent version of ncurses, but calls it ncurses not ncursesw.
-LDFLAGS += -lncurses -lalut -ltoxcore -lcurl -lconfig -lqrencode -lpng -lopenal -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/targets/doc.mk

@@ -1,10 +0,0 @@
-# Doc target
-doc: $(MANFILES:%=$(DOC_DIR)/%)
-
-$(DOC_DIR)/%: $(DOC_DIR)/%.asc
-	@echo "  MAN   $(@F)"
-	@a2x -f manpage -a revdate=$(shell git log -1 --date=short --format="%ad" $<) \
-		-a manmanual="Toxic Manual" -a mansource=toxic \
-		-a manversion=__VERSION__ -a datadir=__DATADIR__ $<
-
-.PHONY: doc

cfg/targets/help.mk

@@ -1,38 +0,0 @@
-# Help target
-help:
-	@echo "-- Targets --"
-	@echo "  all:       Build toxic and documentation [DEFAULT]"
-	@echo "  toxic:     Build toxic"
-	@echo "  doc:       Build documentation"
-	@echo "  install:   Build toxic and install it in PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
-	@echo "  uninstall: Remove toxic from PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
-	@echo "  clean:     Remove built files"
-	@echo "  help:      This help"
-	@echo
-	@echo "-- Variables --"
-	@echo "  DISABLE_X11:            Set to \"1\" to force building without X11 support"
-	@echo "  DISABLE_AV:             Set to \"1\" to force building without audio call support"
-	@echo "  DISABLE_SOUND_NOTIFY:   Set to \"1\" to force building without sound notification support"
-	@echo "  DISABLE_DESKTOP_NOTIFY: Set to \"1\" to force building without desktop notifications support"
-	@echo "  DISABLE_QRCODE:         Set to \"1\" to force building without QR export support"
-	@echo "  DISABLE_QRPNG:          Set to \"1\" to force building without QR exported as PNG support"
-	@echo "  DISABLE_GAMES:          Set to \"1\" to force building without game support"
-	@echo "  ENABLE_PYTHON:          Set to \"1\" to enable building with Python scripting support"
-	@echo "  ENABLE_RELEASE:         Set to \"1\" to build without debug symbols and with full compiler optimizations"
-	@echo "  ENABLE_ASAN:            Set to \"1\" to build with LLVM address sanitizer enabled.
-	@echo "  USER_CFLAGS:            Add custom flags to default CFLAGS"
-	@echo "  USER_LDFLAGS:           Add custom flags to default LDFLAGS"
-	@echo "  PREFIX:                 Specify a prefix directory for binaries, data files,... (default is \"$(abspath $(PREFIX))\")"
-	@echo "  DESTDIR:                Specify a directory where to store installed files (mainly for packaging purpose)"
-	@echo "  MANDIR:                 Specify a directory where to store man pages (default is \"$(abspath $(PREFIX)/share/man)\")"
-	@echo
-	@echo "-- Environment Variables --"
-	@echo "  CFLAGS:                 Add custom flags to default CFLAGS"
-	@echo "  LDFLAGS:                Add custom flags to default LDFLAGS"
-	@echo "  USER_CFLAGS:            Add custom flags to default CFLAGS"
-	@echo "  USER_LDFLAGS:           Add custom flags to default LDFLAGS"
-	@echo "  PREFIX:                 Specify a prefix directory for binaries, data files,... (default is \"$(abspath $(PREFIX))\")"
-	@echo "  DESTDIR:                Specify a directory where to store installed files (mainly for packaging purpose)"
-	@echo "  MANDIR:                 Specify a directory where to store man pages (default is \"$(abspath $(PREFIX)/share/man)\")"
-
-.PHONY: help

cfg/targets/install.mk

@@ -1,41 +0,0 @@
-# Install target
-install: $(BUILD_DIR)/toxic
-	@echo "Installing toxic executable"
-	@mkdir -p $(abspath $(DESTDIR)/$(BINDIR))
-	@install -m 0755 $(BUILD_DIR)/toxic $(abspath $(DESTDIR)/$(BINDIR)/toxic)
-	
-	@echo "Installing desktop file"
-	@mkdir -p $(abspath $(DESTDIR)/$(APPDIR))
-	@install -m 0644 $(MISC_DIR)/$(DESKFILE) $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
-	
-	@echo "Installing data files"
-	@mkdir -p $(abspath $(DESTDIR)/$(DATADIR))
-	@for f in $(DATAFILES) ; do \
-		install -m 0644 $(MISC_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
-		file=$(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
-		sed -e 's:__DATADIR__:'$(abspath $(DATADIR))':g' $$file > temp_file && \
-		mv temp_file $$file ;\
-	done
-	@mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds
-	@for f in $(SNDFILES) ; do \
-		install -m 0644 $(SND_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)/sounds/$$f) ;\
-	done
-	
-	@echo "Installing man pages"
-	@mkdir -p $(abspath $(DESTDIR)/$(MANDIR))
-	@for f in $(MANFILES) ; do \
-		if [ ! -e "$(DOC_DIR)/$$f" ]; then \
-			continue ;\
-		fi ;\
-		section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $${f##*.}` ;\
-		file=$$section/$$f ;\
-		mkdir -p $$section ;\
-		install -m 0644 $(DOC_DIR)/$$f $$file ;\
-		sed -e 's:__VERSION__:'$(VERSION)':g' $$file > temp_file && \
-		mv temp_file $$file ;\
-		sed -e 's:__DATADIR__:'$(abspath $(DATADIR))':g' $$file > temp_file && \
-		mv temp_file $$file ;\
-		gzip -f -n -9 $$file ;\
-	done
-
-.PHONY: install

cfg/targets/uninstall.mk

@@ -1,24 +0,0 @@
-# Uninstall target
-uninstall:
-	@echo "Removing toxic executable"
-	@rm -f $(abspath $(DESTDIR)/$(BINDIR)/toxic)
-	
-	@echo "Removing desktop file"
-	@rm -f $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
-	
-	@echo "Removing data files"
-	@for f in $(DATAFILES) ; do \
-		rm -f $(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
-	done
-	@for f in $(SNDFILES) ; do \
-		rm -f $(abspath $(DESTDIR)/$(DATADIR)/sounds/$$f) ;\
-	done
-	
-	@echo "Removing man pages"
-	@for f in $(MANFILES) ; do \
-		section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $${f##*.}` ;\
-		file=$$section/$$f ;\
-		rm -f $$file $$file.gz ;\
-	done
-
-.PHONY: uninstall

configure.ac

@@ -0,0 +1,506 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.65])
+AC_INIT([toxic], [0.4.1], [https://tox.im/])
+AC_CONFIG_AUX_DIR(configure_aux)
+AC_CONFIG_SRCDIR([src/toxic.c])
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([1.10 -Wall])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AC_CONFIG_MACRO_DIR([m4])
+
+if test "x${prefix}" = "xNONE"; then
+    prefix="${ac_default_prefix}"
+fi
+
+DEPSEARCH=
+LIBTOXCORE_SEARCH_HEADERS=
+LIBTOXCORE_SEARCH_LIBS=
+LIBSODIUM_SEARCH_HEADERS=
+LIBSODIUM_SEARCH_LIBS=
+
+LIBTOXCORE_FOUND="no"
+NCURSES_FOUND="no"
+NCURSES_WIDECHAR_SUPPORT="no"
+
+AC_ARG_WITH(dependency-search,
+    AC_HELP_STRING([--with-dependency-search=DIR],
+                   [search for dependencies in DIR, i.e. look for libraries in
+                    DIR/lib and for headers in DIR/include]),
+    [
+        DEPSEARCH="$withval"
+    ]
+)
+
+if test -n "$DEPSEARCH"; then
+    CFLAGS="$CFLAGS -I$DEPSEARCH/include"
+    CPPFLAGS="$CPPFLAGS -I$DEPSEARCH/include"
+    LDFLAGS="$LDFLAGS -L$DEPSEARCH/lib"
+    export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$DEPSEARCH/lib/pkgconfig:/usr/local/lib/pkgconfig
+fi
+
+AC_ARG_WITH(libtoxcore-headers,
+        AC_HELP_STRING([--with-libtoxcore-headers=DIR],
+                       [search for libtoxcore header files in DIR/tox]),
+        [
+            LIBTOXCORE_SEARCH_HEADERS="$withval"
+            AC_MSG_NOTICE([Will search for libtoxcore header files in $withval])
+        ]
+)
+
+AC_ARG_WITH(libtoxcore-libs,
+        AC_HELP_STRING([--with-libtoxcore-libs=DIR],
+                       [search for libtoxcore libraries in DIR]),
+        [
+            LIBTOXCORE_SEARCH_LIBS="$withval"
+            AC_MSG_NOTICE([Will search for libtoxcore libraries in $withval])
+        ]
+)
+
+AC_ARG_WITH(libsodium-headers,
+        AC_HELP_STRING([--with-libsodium-headers=DIR],
+                       [search for libsodium header files in DIR]),
+        [
+            LIBSODIUM_SEARCH_HEADERS="$withval"
+            AC_MSG_NOTICE([Will search for libsodium header files in $withval])
+        ]
+)
+
+AC_ARG_WITH(libsodium-libs,
+        AC_HELP_STRING([--with-libsodium-libs=DIR],
+                       [search for libsodium libraries in DIR]),
+        [
+            LIBSODIUM_SEARCH_LIBS="$withval"
+            AC_MSG_NOTICE([Will search for libsodium libraries in $withval])
+        ]
+)
+
+WIN32=no
+MACH=no
+AC_CANONICAL_HOST
+case $host_os in
+    *mingw*)
+        WIN32="yes"
+    ;;
+    darwin*)
+        MACH=yes
+    ;;
+    *freebsd*)
+        LDFLAGS="$LDFLAGS -L/usr/local/lib"
+        CFLAGS="$CFLAGS -I/usr/local/include"
+        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+    ;;
+esac
+
+# Checks for programs.
+AC_PROG_CC
+AM_PROG_CC_C_O
+
+AC_CHECK_HEADERS(
+    [limits.h locale.h stdint.h stdlib.h string.h unistd.h wchar.h wctype.h],
+    [],
+    [ AC_MSG_ERROR([required header is missing on your system]) ])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_TYPE_SIZE_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
+AC_TYPE_UINT8_T
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_CHECK_FUNCS(
+    [iswprint memmove memset mkdir setlocale strchr strdup],
+    [],
+    [ AC_MSG_ERROR([required library function is missing on your system])])
+
+AX_PTHREAD( [], [ AC_MSG_ERROR([pthreads not found on your system]) ])
+
+# pkg-config based tests
+PKG_PROG_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+    if test "x$WIN32" != "xyes"; then
+        PKG_CHECK_MODULES([NCURSES], [ncursesw],
+            [
+                NCURSES_FOUND="yes"
+                NCURSES_WIDECHAR_SUPPORT="yes"
+            ],
+            [
+                NCURSES_WIDECHAR_SUPPORT="no"
+                PKG_CHECK_MODULES([NCURSES], [ncurses],
+                    [
+                        NCURSES_FOUND="yes"
+                    ],
+                    [
+                        AC_MSG_WARN([$NCURSES_PKG_ERRORS])
+                    ])
+            ])
+    fi
+else
+    AC_MSG_WARN([pkg-config was not found on your sytem])
+fi
+
+if (test "x$NCURSES_FOUND" = "xno") && (test "x$WIN32" != "xyes"); then
+    AC_PATH_PROG([CURSES_CONFIG], [ncursesw5-config], [no])
+    if test "x$CURSES_CONFIG" != "xno"; then
+        AC_MSG_CHECKING(ncurses cflags)
+        NCURSES_CFLAGS=`${CURSES_CONFIG} --cflags`
+        AC_MSG_RESULT($NCURSES_CFLAGS)
+
+        AC_MSG_CHECKING(ncurses libraries)
+        NCURSES_LIBS=`${CURSES_CONFIG} --libs`
+        AC_MSG_RESULT($NCURSES_LIBS)
+
+        AC_SUBST(NCURSES_CFLAGS)
+        AC_SUBST(NCURSES_LIBS)
+        NCURSES_FOUND="yes"
+        NCURSES_WIDECHAR_SUPPORT="yes"
+    fi
+fi
+
+if (test "x$NCURSES_FOUND" = "xno") && (test "x$WIN32" != "xyes"); then
+    unset ac_cv_path_CURSES_CONFIG
+    AC_PATH_PROG([CURSES_CONFIG], [ncursesw5.4-config], [no])
+    if test "x$CURSES_CONFIG" != "xno"; then
+        AC_MSG_CHECKING(ncurses cflags)
+        NCURSES_CFLAGS=`${CURSES_CONFIG} --cflags`
+        AC_MSG_RESULT($NCURSES_CFLAGS)
+
+        AC_MSG_CHECKING(ncurses libraries)
+        NCURSES_LIBS=`${CURSES_CONFIG} --libs`
+        AC_MSG_RESULT($NCURSES_LIBS)
+
+        AC_SUBST(NCURSES_CFLAGS)
+        AC_SUBST(NCURSES_LIBS)
+        NCURSES_FOUND="yes"
+        NCURSES_WIDECHAR_SUPPORT="yes"
+    fi
+fi
+
+if (test "x$NCURSES_FOUND" = "xno") && (test "x$WIN32" != "xyes"); then
+    unset ac_cv_path_CURSES_CONFIG
+    AC_PATH_PROG([CURSES_CONFIG], [ncurses5-config], [no])
+    if test "x$CURSES_CONFIG" != "xno"; then
+        AC_MSG_CHECKING(ncurses cflags)
+        NCURSES_CFLAGS=`${CURSES_CONFIG} --cflags`
+        AC_MSG_RESULT($NCURSES_CFLAGS)
+
+        AC_MSG_CHECKING(ncurses libraries)
+        NCURSES_LIBS=`${CURSES_CONFIG} --libs`
+        AC_MSG_RESULT($NCURSES_LIBS)
+
+        AC_SUBST(NCURSES_CFLAGS)
+        AC_SUBST(NCURSES_LIBS)
+        NCURSES_FOUND="yes"
+    fi
+fi
+
+if (test "x$NCURSES_FOUND" = "xno") && (test "x$WIN32" != "xyes"); then
+    unset ac_cv_path_CURSES_CONFIG
+    AC_PATH_PROG([CURSES_CONFIG], [ncurses5.4-config], [no])
+    if test "x$CURSES_CONFIG" != "xno"; then
+        AC_MSG_CHECKING(ncurses cflags)
+        NCURSES_CFLAGS=`${CURSES_CONFIG} --cflags`
+        AC_MSG_RESULT($NCURSES_CFLAGS)
+
+        AC_MSG_CHECKING(ncurses libraries)
+        NCURSES_LIBS=`${CURSES_CONFIG} --libs`
+        AC_MSG_RESULT($NCURSES_LIBS)
+
+        AC_SUBST(NCURSES_CFLAGS)
+        AC_SUBST(NCURSES_LIBS)
+        NCURSES_FOUND="yes"
+    fi
+fi
+
+if test "x$NCURSES_FOUND" = "xno"; then
+    AC_CHECK_HEADER([curses.h],
+        [],
+        [
+            AC_MSG_ERROR([headers for the ncurses library were not found on your system])
+        ]
+    )
+
+    if test "x$WIN32" = "xyes"; then
+        dnl Check if pdcurses provides wide char support
+        NCURSES_WIDECHAR_SUPPORT="no"
+        AC_CHECK_LIB([pdcurses], [clear],
+            [],
+            [
+                AC_MSG_ERROR([required library pdcurses was not found on your system])
+            ]
+        )
+
+        AC_CHECK_LIB(ws2_32, main,
+            [
+                WINSOCK2_LIBS="-lws2_32"
+                AC_SUBST(WINSOCK2_LIBS)
+            ],
+            [
+                AC_MSG_ERROR([required library winsock2 was not found on the system, please check your MinGW installation])
+            ]
+        )
+        AC_DEFINE([_WIN32_WINNT], [0x501],
+                  [enable getaddrinfo/freeaddrinfo on XP and higher])
+    else
+        AC_CHECK_LIB([ncursesw], [wget_wch],
+            [
+                NCURSES_WIDECHAR_SUPPORT="yes"
+            ],
+            [
+                unset ac_cv_lib_ncursesw_wget_wch
+                AC_CHECK_LIB([ncursesw], [wget_wch],
+                    [
+                        NCURSES_WIDECHAR_SUPPORT="yes"
+                    ],
+                    [
+                        NCURSES_WIDECHAR_SUPPORT="no"
+                        AC_CHECK_LIB([ncurses], [clear],
+                            [],
+                            [
+                                unset ac_cv_lib_ncurses_clear
+                                AC_CHECK_LIB([ncurses], [clear],
+                                    [],
+                                    [
+                                        AC_MSG_ERROR([required library ncurses was not found on your system])
+                                    ],
+                                    [
+                                        -ltinfo
+                                    ]
+                                )
+                            ]
+                        )
+                    ],
+                    [
+                        -ltinfo
+                    ]
+                )
+            ]
+        )
+    fi
+fi
+
+if test -n "$PKG_CONFIG"; then
+    PKG_CHECK_MODULES(LIBTOXCORE, [libtoxcore],
+        [
+            LIBTOXCORE_FOUND="yes"
+        ],
+        [
+            AC_MSG_WARN([required library libsodium was not found in requested location $LIBSODIUM_SEARCH_LIBS])
+        ])
+fi
+
+if test "x$LIBTOXCORE_FOUND" = "xno"; then
+    LIBSODIUM_LIBS=
+    LIBSODIUM_LDFLAGS=
+    LDFLAGS_SAVE="$LDFLAGS"
+    if test -n "$LIBSODIUM_SEARCH_LIBS"; then
+        LDFLAGS="$LDFLAGS -L$LIBSODIUM_SEARCH_LIBS"
+        AC_CHECK_LIB(sodium, randombytes_random,
+            [
+                LIBSODIUM_LDFLAGS="-L$LIBSODIUM_SEARCH_LIBS"
+                LIBSODIUM_LIBS="-lsodium"
+            ],
+            [
+                AC_MSG_ERROR([required library libsodium was not found in requested location $LIBSODIUM_SEARCH_LIBS])
+            ]
+        )
+    else
+        AC_CHECK_LIB(sodium, randombytes_random,
+            [],
+            [
+                AC_MSG_ERROR([required library libsodium was not found on your system, please check http://download.libsodium.org/libsodium/releases/])
+            ]
+        )
+    fi
+
+    LDFLAGS="$LDFLAGS_SAVE"
+    AC_SUBST(LIBSODIUM_LIBS)
+    AC_SUBST(LIBSODIUM_LDFLAGS)
+
+
+
+    LIBTOXCORE_CFLAGS=
+    CFLAGS_SAVE="$CFLAGS"
+    CPPFLAGS_SAVE="$CPPFLAGS"
+
+    if test -n "$LIBTOXCORE_SEARCH_HEADERS"; then
+        CFLAGS="$CFLAGS -I$LIBTOXCORE_SEARCH_HEADERS"
+        CPPFLAGS="$CPPFLAGS -I$LIBTOXCORE_SEARCH_HEADERS"
+        AC_CHECK_HEADER([tox/tox.h],
+            [
+                LIBTOXCORE_CFLAGS="-I$LIBTOXCORE_SEARCH_HEADERS"
+            ],
+            [
+                AC_MSG_ERROR([headers for the toxcore library were not found on your system])
+            ]
+        )
+    else
+        AC_CHECK_HEADER([tox/tox.h],
+            [],
+            [
+                AC_MSG_ERROR([headers for the toxcore library were not found on your system])
+            ],
+        )
+    fi
+    CFLAGS="$CFLAGS_SAVE"
+    CPPFLAGS="$CPPFLAGS_SAVE"
+    AC_SUBST(LIBTOXCORE_CFLAGS)
+
+    LIBTOXCORE_LIBS=
+    LIBTOXCORE_LDFLAGS=
+    LDFLAGS_SAVE="$LDFLAGS"
+    if test -n "$LIBTOXCORE_SEARCH_LIBS"; then
+        LDFLAGS="$LDFLAGS $LIBSODIUM_LDFLAGS -L$LIBTOXCORE_SEARCH_LIBS"
+        AC_CHECK_LIB([toxcore], [tox_new],
+            [
+                LIBTOXCORE_LDFLAGS="-L$LIBTOXCORE_SEARCH_LIBS"
+                LIBTOXCORE_LIBS="-ltoxcore"
+            ],
+            [
+                AC_MSG_ERROR([required library toxcore was not found on your system])
+            ],
+            [
+                $WINSOCK2_LIBS
+                $LIBSODIUM_LIBS
+            ]
+        )
+    else
+        LDFLAGS="$LDFLAGS $LIBSODIUM_LDFLAGS"
+        AC_CHECK_LIB([toxcore], [tox_new],
+            [],
+            [
+                AC_MSG_ERROR([required library toxcore was not found on your system])
+            ],
+            [
+                $WINSOCK2_LIBS
+                $LIBSODIUM_LIBS
+            ]
+        )
+    fi
+    LDFLAGS="$LDFLAGS_SAVE"
+    AC_SUBST(LIBTOXCORE_LIBS)
+    AC_SUBST(LIBTOXCORE_LDFLAGS)
+fi
+
+AC_CHECK_HEADER([resolv.h], [],
+                [
+                    AC_MSG_ERROR([resolv.h header was not found on your system])
+                ])
+
+AC_CHECK_LIB(resolv, __res_init, [],
+             [
+                AC_MSG_ERROR([libresolv library was not found on your system])
+             ])
+
+####
+#### A/V Stuff
+
+AV_SEARCH_DIR=
+BUILD_AV="yes"
+
+AC_ARG_WITH(libtoxav-prefix,
+    AC_HELP_STRING([--with-libtoxav-prefix=DIR],
+                   [search for libtoxav in DIR, i.e. look for libraries in
+                    DIR/lib and for headers in DIR/include]),
+    [
+        AV_SEARCH_DIR="$withval"
+    ]
+)
+
+if test -n "$AV_SEARCH_DIR"; then
+    CFLAGS="$CFLAGS -I$AV_SEARCH_DIR/include"
+    CPPFLAGS="$CPPFLAGS -I$AV_SEARCH_DIR/include"
+    LDFLAGS="$LDFLAGS -L$AV_SEARCH_DIR/lib"
+    export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$AV_SEARCH_DIR/lib/pkgconfig
+fi
+
+# Check if specified enable
+AC_ARG_ENABLE([av],
+    [AC_HELP_STRING([--disable-av], [build AV support libraries (default: auto)]) ],
+    [
+        if test "x$enableval" = "xno"; then
+            BUILD_AV="no"
+        elif test "x$enableval" = "xyes"; then
+            BUILD_AV="yes"
+        fi
+    ]
+)
+
+# Check for A/V library
+
+if test "x$BUILD_AV" = "xyes"; then
+    PKG_CHECK_MODULES([OPENAL], [openal],
+    [],
+    [
+        if test "x$MACH" = "xyes"; then
+            CFLAGS="$CFLAGS -framework OpenAL"
+            AC_CHECK_HEADER([OpenAL/al.h],
+                [
+                    OPENAL_CFLAGS="-framework OpenAL"
+                    OPENAL_LIBS="-framework OpenAL"
+                    AC_SUBST(OPENAL_CFLAGS)
+                    AC_SUBST(OPENAL_LIBS)
+                ],
+                [
+                    AC_MSG_NOTICE([No openal framework; disabling A/V support])
+                    BUILD_AV="no"
+                ]
+            )
+            CFLAGS="$CFLAGS_SAVE"
+        else
+            AC_MSG_NOTICE([No openal library; disabling A/V support])
+            BUILD_AV="no"
+        fi
+    ])
+fi
+
+if test "x$BUILD_AV" = "xyes"; then
+    PKG_CHECK_MODULES([LIBTOXAV], [libtoxav],
+    [
+        AC_CHECK_HEADER([tox/toxav.h],
+        [
+            # Place define for audio support
+            AC_DEFINE([_SUPPORT_AUDIO], [], [Is audio supported])
+            AC_MSG_NOTICE([Building with audio support])
+        ],
+        [
+            AC_MSG_NOTICE([No A/V headers; disabling A/V support])
+            BUILD_AV="no"
+        ],)
+    ],
+    [
+        AC_MSG_NOTICE([No A/V library; disabling A/V support])
+        BUILD_AV="no"
+    ])
+fi
+
+AM_CONDITIONAL(BUILD_AV, test "x$BUILD_AV" = "xyes")
+
+TOXIC_VERSION="$PACKAGE_VERSION"
+AC_PATH_PROG([GIT], [git], [no])
+if test "x$GIT" != "xno"; then
+    if test -d ${srcdir}/.git; then
+        TOXIC_VERSION="${TOXIC_VERSION}_r`${GIT} rev-list HEAD --count`"
+    fi
+fi
+AC_SUBST(TOXIC_VERSION)
+
+eval PACKAGE_DATADIR="${datadir}/${PACKAGE}"
+eval PACKAGE_DATADIR="${PACKAGE_DATADIR}"
+AC_DEFINE_UNQUOTED(PACKAGE_DATADIR, "$PACKAGE_DATADIR", [toxic data directory])
+
+if test "x$NCURSES_WIDECHAR_SUPPORT" = "xyes"; then
+    AC_DEFINE([HAVE_WIDECHAR], [1], [ncurses wide char support available])
+    AC_DEFINE([_XOPEN_SOURCE_EXTENDED], [1],
+              [enable X/Open Portability Guide functionality])
+fi
+
+AC_CONFIG_FILES([Makefile
+                 misc/Makefile
+                 build/Makefile])
+AC_OUTPUT

doc/toxic.1

@@ -1,169 +0,0 @@
-'\" t
-.\"     Title: toxic
-.\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2021-12-05
-.\"    Manual: Toxic Manual
-.\"    Source: toxic __VERSION__
-.\"  Language: English
-.\"
-.TH "TOXIC" "1" "2021\-12\-05" "toxic __VERSION__" "Toxic Manual"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-toxic \- CLI client for Tox
-.SH "SYNOPSIS"
-.sp
-\fBtoxic\fR [\-f \fIdata\-file\fR] [\-x] [\-4] [\-c \fIconfig\-file\fR] [\-n \fInodes\-file\fR] [\-h]
-.SH "DESCRIPTION"
-.sp
-toxic is an ncurses\-based instant messaging client for Tox which formerly resided in the Tox core repository, and is now available as a standalone application\&.
-.SH "OPTIONS"
-.PP
-\-4, \-\-ipv4
-.RS 4
-Force IPv4 connection
-.RE
-.PP
-\-b, \-\-debug
-.RS 4
-Enable stderr for debugging\&. Redirect output to avoid breaking the curses interface and better capture messages\&.
-.RE
-.PP
-\-c, \-\-config config\-file
-.RS 4
-Use specified
-\fIconfig\-file\fR
-instead of
-\fI~/\&.config/tox/toxic\&.conf\fR
-.RE
-.PP
-\-d, \-\-default\-locale
-.RS 4
-Use default locale
-.RE
-.PP
-\-e, \-\-encrypt\-data
-.RS 4
-Encrypt an unencrypted data file\&. An error will occur if this option is used with an encrypted data file\&.
-.RE
-.PP
-\-f, \-\-file data\-file
-.RS 4
-Use specified
-\fIdata\-file\fR
-instead of
-\fI~/\&.config/tox/toxic_profile\&.tox\fR
-.RE
-.PP
-\-h, \-\-help
-.RS 4
-Show help message
-.RE
-.PP
-\-l, \-\-logging
-.RS 4
-Enable toxcore logging to stderr
-.RE
-.PP
-\-n, \-\-nodes nodes\-file
-.RS 4
-Use specified
-\fInodes\-file\fR
-for DHT bootstrap nodes instead of
-\fI~/\&.config/tox/DHTnodes\&.json\fR
-.RE
-.PP
-\-o, \-\-noconnect
-.RS 4
-Do not connect to the DHT network
-.RE
-.PP
-\-p, \-\-SOCKS5\-proxy
-.RS 4
-Use a SOCKS5 proxy: Requires [IP] [port]
-.RE
-.PP
-\-P, \-\-HTTP\-proxy
-.RS 4
-Use a HTTP proxy: Requires [IP] [port]
-.RE
-.PP
-\-r, \-\-namelist
-.RS 4
-Use specified nameservers list
-.RE
-.PP
-\-t, \-\-force\-tcp
-.RS 4
-Force TCP connection (use this with proxies)
-.RE
-.PP
-\-T, \-\-tcp\-relay
-.RS 4
-Act as a TCP relay server for the network (Note: this uses significantly more bandwidth)
-.RE
-.PP
-\-u, \-\-unencrypt\-data
-.RS 4
-Unencrypt a data file\&. A warning will appear if this option is used with a data file that is already unencrypted\&.
-.RE
-.SH "FILES"
-.PP
-~/\&.config/tox/DHTnodes\&.json
-.RS 4
-Default location for list of DHT bootstrap nodes (list obtained from
-https://nodes\&.tox\&.chat)\&. This list is automatically updated\&. See
-\fBtoxic\&.conf\fR(5) for details on controlling the update frequency\&.
-.RE
-.PP
-~/\&.config/tox/toxic_profile\&.tox
-.RS 4
-Savestate which contains your personal info (nickname, Tox ID, contacts, etc)
-.RE
-.PP
-~/\&.config/tox/toxic\&.conf
-.RS 4
-Configuration file\&. See
-\fBtoxic\&.conf\fR(5) for more details\&.
-.RE
-.PP
-__DATADIR__/toxic\&.conf\&.example
-.RS 4
-Configuration example\&.
-.RE
-.SH "BUGS"
-.sp
-\-Unicode characters with a width larger than 1 column may cause strange behaviour\&.
-.sp
-\-Screen flickering sometimes occurs on certain terminals\&.
-.sp
-\-Resizing the terminal window when a game window is open will break things\&.
-.SH "LINKS"
-.sp
-Project page: https://github\&.com/JFreegman/toxic
-.sp
-Tox development group public key: 360497DA684BCE2A500C1AF9B3A5CE949BBB9F6FB1F91589806FB04CA039E313
-.SH "AUTHORS"
-.sp
-JFreegman <JFreegman@gmail\&.com>
-.SH "SEE ALSO"
-.sp
-\fBtoxic\&.conf\fR(5)

doc/toxic.1.asc

@@ -1,108 +0,0 @@
-toxic(1)
-========
-
-NAME
-----
-toxic - CLI client for Tox
-
-SYNOPSIS
---------
-*toxic* [-f 'data-file'] [-x] [-4] [-c 'config-file'] [-n 'nodes-file'] [-h]
-
-DESCRIPTION
------------
-toxic is an ncurses-based instant messaging client for Tox which formerly
-resided in the Tox core repository, and is now available as a standalone
-application.
-
-OPTIONS
--------
--4, --ipv4::
-    Force IPv4 connection
-
--b, --debug::
-    Enable stderr for debugging. Redirect output to
-    avoid breaking the curses interface and better capture messages.
-
--c, --config config-file::
-    Use specified 'config-file' instead of '~/.config/tox/toxic.conf'
-
--d, --default-locale::
-    Use default locale
-
--e, --encrypt-data::
-    Encrypt an unencrypted data file. An error will occur if this option
-    is used with an encrypted data file.
-
--f, --file data-file::
-    Use specified 'data-file' instead of '~/.config/tox/toxic_profile.tox'
-
--h, --help::
-    Show help message
-
--l, --logging::
-    Enable toxcore logging to stderr
-
--n, --nodes nodes-file::
-    Use specified 'nodes-file' for DHT bootstrap nodes instead of '~/.config/tox/DHTnodes.json'
-
--o, --noconnect::
-    Do not connect to the DHT network
-
--p, --SOCKS5-proxy::
-    Use a SOCKS5 proxy: Requires [IP] [port]
-
--P, --HTTP-proxy::
-    Use a HTTP proxy: Requires [IP] [port]
-
--r, --namelist::
-    Use specified nameservers list
-
--t, --force-tcp::
-    Force TCP connection (use this with proxies)
-
--T, --tcp-relay::
-    Act as a TCP relay server for the network (Note: this uses significantly more bandwidth)
-
--u, --unencrypt-data::
-    Unencrypt a data file. A warning will appear if this option is used
-    with a data file that is already unencrypted.
-
-FILES
------
-~/.config/tox/DHTnodes.json::
-    Default location for list of DHT bootstrap nodes (list obtained from https://nodes.tox.chat).
-    This list is automatically updated. See *toxic.conf*(5) for details on controlling the update frequency.
-
-~/.config/tox/toxic_profile.tox::
-    Savestate which contains your personal info (nickname, Tox ID, contacts,
-    etc)
-
-~/.config/tox/toxic.conf::
-    Configuration file. See *toxic.conf*(5) for more details.
-
-{datadir}/toxic.conf.example::
-    Configuration example.
-
-BUGS
-----
--Unicode characters with a width larger than 1 column may cause strange
-behaviour.
-
--Screen flickering sometimes occurs on certain terminals.
-
--Resizing the terminal window when a game window is open will break things.
-
-LINKS
------
-Project page: <https://github.com/JFreegman/toxic>
-
-Tox development group public key: 360497DA684BCE2A500C1AF9B3A5CE949BBB9F6FB1F91589806FB04CA039E313
-
-AUTHORS
--------
-JFreegman <JFreegman@gmail.com>
-
-SEE ALSO
---------
-*toxic.conf*(5)

doc/toxic.conf.5

@@ -1,430 +0,0 @@
-'\" t
-.\"     Title: toxic.conf
-.\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2022-06-27
-.\"    Manual: Toxic Manual
-.\"    Source: toxic __VERSION__
-.\"  Language: English
-.\"
-.TH "TOXIC\&.CONF" "5" "2022\-06\-27" "toxic __VERSION__" "Toxic Manual"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-toxic.conf \- Configuration file for toxic
-.SH "SYNOPSIS"
-.sp
-~/\&.config/tox/toxic\&.conf
-.SH "DESCRIPTION"
-.sp
-The \fItoxic\&.conf\fR file is the main configuration file for \fBtoxic\fR(1) client\&. It uses syntax accepted by \fBlibconfig\fR\&. Lines starting with "//" are comments and will be ignored\&.
-.SH "EXAMPLE"
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-// Configuration for interface
-ui = {
-    timestamps = true;
-    alerts = false;
-};
-
-// Configuration for audio
-audio = {
-    input_device = 1;
-};
-.fi
-.if n \{\
-.RE
-.\}
-.SH "OPTIONS"
-.PP
-\fBui\fR
-.RS 4
-Configuration related to interface elements\&.
-.PP
-\fBtimestamps\fR
-.RS 4
-Enable or disable timestamps\&. true or false
-.RE
-.PP
-\fBtime_format\fR
-.RS 4
-Select between 24 and 12 hour time\&. Specify 24 or 12\&. Setting timestamp_format and log_timestamp_format will override this setting\&.
-.RE
-.PP
-\fBtimestamp_format\fR
-.RS 4
-Time format string for the interface enclosed by double quotes\&. See
-\fBdate\fR(1)
-.RE
-.PP
-\fBlog_timestamp_format\fR
-.RS 4
-Time format string for logging enclosed by double quotes\&. See
-\fBdate\fR(1)
-.RE
-.PP
-\fBalerts\fR
-.RS 4
-Enable or disable acoustic alerts on events\&. true or false
-.RE
-.PP
-\fBnative_colors\fR
-.RS 4
-Select between native terminal colors and toxic color theme\&. true or false
-.RE
-.PP
-\fBcolor_bar_bg\fR
-.RS 4
-set background color of chat status bars\&. (black, white, red, green, blue, cyan, yellow, magenta)
-.RE
-.PP
-\fBcolor_bar_fg\fR
-.RS 4
-set foreground (text) color of chat status bars\&. (black, white, red, green, blue, cyan, yellow, magenta)
-.RE
-.PP
-\fBcolor_bar_accent\fR
-.RS 4
-set foreground accent color of chat status bars\&. (black, white, red, green, blue, cyan, yellow, magenta)
-.RE
-.PP
-\fBcolor_bar_notify\fR
-.RS 4
-set foreground notify (and typing) color in chat status bar\&. (black, white, red, green, blue, cyan, yellow, magenta)
-.RE
-.PP
-\fBautolog\fR
-.RS 4
-Enable or disable autologging\&. true or false
-.RE
-.PP
-\fBshow_typing_other\fR
-.RS 4
-Show when others are typing in a 1\-on\-1 chat\&. true or false
-.RE
-.PP
-\fBshow_typing_self\fR
-.RS 4
-Show others when you\(cqre typing in a 1\-on\-1 chat\&. true or false
-.RE
-.PP
-\fBshow_welcome_msg\fR
-.RS 4
-Show welcome message on startup\&. true or false
-.RE
-.PP
-\fBshow_connection_msg\fR
-.RS 4
-Enable friend connection change notifications\&. true or false
-.RE
-.PP
-\fBshow_group_connection_msg\fR
-.RS 4
-Enable group connection change notifications (does not include quit messages)\&. true or false
-.RE
-.PP
-\fBnodelist_update_freq\fR
-.RS 4
-How often in days to update the DHT nodes list\&. (integer; 0 to disable)
-.RE
-.PP
-\fBautosave_freq\fR
-.RS 4
-How often in seconds to auto\-save the Tox data file\&. (integer; 0 to disable)
-.RE
-.PP
-\fBhistory_size\fR
-.RS 4
-Maximum lines for chat window history\&. Integer value\&. (for example: 700)
-.RE
-.PP
-\fBnotification_timeout\fR
-.RS 4
-Time in milliseconds to display a notification\&. Integer value\&. (for example: 3000)
-.RE
-.PP
-\fBline_join\fR
-.RS 4
-Indicator for when someone connects or joins a group\&. Three characters max for line_ settings\&.
-.RE
-.PP
-\fBline_quit\fR
-.RS 4
-Indicator for when someone disconnects or leaves a group\&.
-.RE
-.PP
-\fBline_alert\fR
-.RS 4
-Indicator for alert messages\&.
-.RE
-.PP
-\fBline_normal\fR
-.RS 4
-Indicator for normal messages\&.
-.RE
-.PP
-\fBmplex_away\fR
-.RS 4
-Set user status when attaching and detaching from GNU screen or tmux\&. true or false
-.RE
-.PP
-\fBmplex_away_note\fR
-.RS 4
-Status message to set when status is set to away due to screen/tmux detach\&. When attaching, the status message is set back to the original value\&.
-.RE
-.PP
-\fBgroup_part_message\fR
-.RS 4
-Parting message that will be sent to all groupchat peers when you leave the group\&.
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-The following options control whether to output a terminal bell on certain events\&.
-Some terminals mark the window as urgent when a bell is received\&. Urgent windows are usually highlighted in the taskbar and some window managers even provide shortcuts to jump to the next urgent window\&.
-These options don\*(Aqt affect the "alerts" option\&.
-.fi
-.if n \{\
-.RE
-.\}
-.RE
-.PP
-\fBbell_on_message\fR
-.RS 4
-Enable/Disable the terminal bell when receiving a message\&. true or false
-.RE
-.PP
-\fBbell_on_filetrans\fR
-.RS 4
-Enable/Disable the terminal bell when receiving a filetransfer\&. true or false
-.RE
-.PP
-\fBbell_on_filetrans_accept\fR
-.RS 4
-Enable/Disable the terminal bell when a filetransfer was accepted\&. true or false
-.RE
-.PP
-\fBbell_on_invite\fR
-.RS 4
-Enable/Disable the terminal bell when receiving a group/call invite\&. true or false
-.RE
-.RE
-.PP
-\fBaudio\fR
-.RS 4
-Configuration related to audio devices\&.
-.PP
-\fBinput_device\fR
-.RS 4
-Audio input device\&. Integer value\&. Number corresponds to
-/lsdev in
-.RE
-.PP
-\fBoutput_device\fR
-.RS 4
-Audio output device\&. Integer value\&. Number corresponds to
-/lsdev out
-.RE
-.PP
-\fBVAD_threshold\fR
-.RS 4
-Voice Activity Detection threshold\&. Float value\&. Recommended values are 1\&.0\-40\&.0
-.RE
-.PP
-\fBconference_audio_channels\fR
-.RS 4
-Number of channels for conference audio broadcast\&. Integer value\&. 1 (mono) or 2 (stereo)
-.RE
-.PP
-\fBchat_audio_channels\fR
-.RS 4
-Number of channels for 1\-on\-1 audio broadcast\&. Integer value\&. 1 (mono) or 2 (stereo)
-.RE
-.PP
-\fBpush_to_talk\fR
-.RS 4
-Enable/Disable Push\-To\-Talk for conference audio chats (active key is F2)\&. true or false
-.RE
-.RE
-.PP
-\fBtox\fR
-.RS 4
-Configuration related to paths\&.
-.PP
-\fBdownload_path\fR
-.RS 4
-Default path for downloads\&. String value\&. Absolute path for downloaded files\&.
-.RE
-.PP
-\fBavatar_path\fR
-.RS 4
-Path for your avatar (file must be a \&.png and cannot exceed 16\&.3 KiB)
-.RE
-.PP
-\fBautorun_path\fR
-.RS 4
-Path for any scripts that should be run on startup
-.RE
-.PP
-\fBchatlogs_path\fR
-.RS 4
-Default path for chatlogs\&. String value\&. Absolute path for chatlog files\&.
-.RE
-.PP
-\fBpassword_eval\fR
-.RS 4
-Replace password prompt by running this command and using its output as the password\&.
-.RE
-.RE
-.PP
-\fBsounds\fR
-.RS 4
-Configuration related to notification sounds\&. Special value "silent" can be used to disable a specific notification\&.
-
-Each value is a string which corresponds to the absolute path of a wav sound file\&.
-.PP
-\fBnotif_error\fR
-.RS 4
-Sound to play when an error occurs\&.
-.RE
-.PP
-\fBself_log_in\fR
-.RS 4
-Sound to play when you log in\&.
-.RE
-.PP
-\fBself_log_out\fR
-.RS 4
-Sound to play when you log out\&.
-.RE
-.PP
-\fBuser_log_in\fR
-.RS 4
-Sound to play when a contact become online\&.
-.RE
-.PP
-\fBuser_log_out\fR
-.RS 4
-Sound to play when a contact become offline\&.
-.RE
-.PP
-\fBcall_incoming\fR
-.RS 4
-Sound to play when you receive an incoming call\&.
-.RE
-.PP
-\fBcall_outgoing\fR
-.RS 4
-Sound to play when you start a call\&.
-.RE
-.PP
-\fBgeneric_message\fR
-.RS 4
-Sound to play when an event occurs\&.
-.RE
-.PP
-\fBtransfer_pending\fR
-.RS 4
-Sound to play when you receive a file transfer request\&.
-.RE
-.PP
-\fBtransfer_completed\fR
-.RS 4
-Sound to play when a file transfer is completed\&.
-.RE
-.RE
-.PP
-\fBkeys\fR
-.RS 4
-Configuration related to user interface interaction\&. Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN\&.
-
-Each value is a string which corresponds to a key combination\&.
-.PP
-\fBnext_tab\fR
-.RS 4
-Key combination to switch next tab\&.
-.RE
-.PP
-\fBprev_tab\fR
-.RS 4
-Key combination to switch previous tab\&.
-.RE
-.PP
-\fBscroll_line_up\fR
-.RS 4
-Key combination to scroll one line up\&.
-.RE
-.PP
-\fBscroll_line_down\fR
-.RS 4
-Key combination to scroll one line down\&.
-.RE
-.PP
-\fBhalf_page_up\fR
-.RS 4
-Key combination to scroll half page up\&.
-.RE
-.PP
-\fBhalf_page_down\fR
-.RS 4
-Key combination to scroll half page down\&.
-.RE
-.PP
-\fBpage_bottom\fR
-.RS 4
-Key combination to scroll to page bottom\&.
-.RE
-.PP
-\fBtoggle_peerlist\fR
-.RS 4
-Toggle the peer list on and off\&.
-.RE
-.PP
-\fBtoggle_paste_mode\fR
-.RS 4
-Toggle treating linebreaks as enter key press\&.
-.RE
-.RE
-.SH "FILES"
-.PP
-~/\&.config/tox/toxic\&.conf
-.RS 4
-Main configuration file\&.
-.RE
-.PP
-__DATADIR__/toxic\&.conf\&.example
-.RS 4
-Configuration example\&.
-.RE
-.SH "RESOURCES"
-.sp
-Project page: https://github\&.com/JFreegman/toxic
-.sp
-Tox development group public key: 360497DA684BCE2A500C1AF9B3A5CE949BBB9F6FB1F91589806FB04CA039E313
-.SH "AUTHORS"
-.sp
-JFreegman <JFreegman@gmail\&.com>
-.SH "SEE ALSO"
-.sp
-\fBtoxic\fR(1)

doc/toxic.conf.5.asc

@@ -1,281 +0,0 @@
-toxic.conf(5)
-=============
-
-NAME
-----
-toxic.conf - Configuration file for toxic
-
-
-SYNOPSIS
---------
-~/.config/tox/toxic.conf
-
-
-DESCRIPTION
------------
-The 'toxic.conf' file is the main configuration file for *toxic*(1) client.
-It uses syntax accepted by *libconfig*.
-Lines starting with "//" are comments and will be ignored.
-
-
-EXAMPLE
--------
-----
-// Configuration for interface
-ui = {
-    timestamps = true;
-    alerts = false;
-};
-
-// Configuration for audio
-audio = {
-    input_device = 1;
-};
-----
-
-
-OPTIONS
--------
-*ui*::
-    Configuration related to interface elements.
-
-    *timestamps*;;
-        Enable or disable timestamps. true or false
-
-    *time_format*;;
-	Select between 24 and 12 hour time. Specify 24 or 12. Setting
-        timestamp_format and log_timestamp_format will override this setting.
-
-    *timestamp_format*;;
-        Time format string for the interface enclosed by double quotes.
-        See *date*(1)
-
-    *log_timestamp_format*;;
-        Time format string for logging enclosed by double quotes.
-        See *date*(1)
-
-    *alerts*;;
-        Enable or disable acoustic alerts on events. true or false
-
-    *native_colors*;;
-        Select between native terminal colors and toxic color theme. true or false
-
-    *color_bar_bg*;;
-        set background color of chat status bars. (black, white, red, green, blue, cyan, yellow, magenta)
-
-    *color_bar_fg*;;
-        set foreground (text) color of chat status bars. (black, white, red, green, blue, cyan, yellow, magenta)
-
-    *color_bar_accent*;;
-        set foreground accent color of chat status bars. (black, white, red, green, blue, cyan, yellow, magenta)
-
-    *color_bar_notify*;;
-        set foreground notify (and typing) color in chat status bar. (black, white, red, green, blue, cyan, yellow, magenta)
-
-    *autolog*;;
-        Enable or disable autologging. true or false
-
-    *show_typing_other*;;
-        Show when others are typing in a 1-on-1 chat. true or false
-
-    *show_typing_self*;;
-        Show others when you're typing in a 1-on-1 chat. true or false
-
-    *show_welcome_msg*;;
-        Show welcome message on startup. true or false
-
-    *show_connection_msg*;;
-        Enable friend connection change notifications. true or false
-
-    *show_group_connection_msg*;;
-        Enable group connection change notifications (does not include quit messages). true or false
-
-    *nodelist_update_freq*;;
-        How often in days to update the DHT nodes list. (integer; 0 to disable)
-
-    *autosave_freq*;;
-        How often in seconds to auto-save the Tox data file. (integer; 0 to disable)
-
-    *history_size*;;
-        Maximum lines for chat window history. Integer value. (for example: 700)
-
-    *notification_timeout*;;
-        Time in milliseconds to display a notification. Integer value. (for example: 3000)
-
-    *line_join*;;
-        Indicator for when someone connects or joins a group.
-        Three characters max for line_ settings.
-
-    *line_quit*;;
-        Indicator for when someone disconnects or leaves a group.
-
-    *line_alert*;;
-        Indicator for alert messages.
-
-    *line_normal*;;
-        Indicator for normal messages.
-
-    *mplex_away*;;
-        Set user status when attaching and detaching from GNU screen or tmux.
-        true or false
-
-    *mplex_away_note*;;
-        Status message to set when status is set to away due to screen/tmux
-        detach. When attaching, the status message is set back to the original
-        value.
-
-    *group_part_message*;;
-	Parting message that will be sent to all groupchat peers when you leave the group.
-
-    The following options control whether to output a terminal bell on certain events.
-    Some terminals mark the window as urgent when a bell is received. Urgent windows are usually highlighted in the taskbar and some window managers even provide shortcuts to jump to the next urgent window.
-    These options don't affect the "alerts" option.
-
-    *bell_on_message*;;
-        Enable/Disable the terminal bell when receiving a message. true or false
-
-    *bell_on_filetrans*;;
-        Enable/Disable the terminal bell when receiving a filetransfer. true or false
-
-    *bell_on_filetrans_accept*;;
-        Enable/Disable the terminal bell when a filetransfer was accepted. true or false
-
-    *bell_on_invite*;;
-        Enable/Disable the terminal bell when receiving a group/call invite. true or false
-
-
-*audio*::
-    Configuration related to audio devices.
-
-    *input_device*;;
-        Audio input device. Integer value. Number corresponds to `/lsdev in`
-
-    *output_device*;;
-        Audio output device. Integer value. Number corresponds to `/lsdev out`
-
-    *VAD_threshold*;;
-        Voice Activity Detection threshold.  Float value. Recommended values are
-        1.0-40.0
-
-    *conference_audio_channels*;;
-        Number of channels for conference audio broadcast. Integer value. 1 (mono) or 2 (stereo)
-
-    *chat_audio_channels*;;
-        Number of channels for 1-on-1 audio broadcast. Integer value. 1 (mono) or 2 (stereo)
-
-    *push_to_talk*;;
-        Enable/Disable Push-To-Talk for conference audio chats (active key is F2). true or false
-
-*tox*::
-    Configuration related to paths.
-
-    *download_path*;;
-        Default path for downloads. String value. Absolute path for downloaded
-        files.
-
-    *avatar_path*;;
-        Path for your avatar (file must be a .png and cannot exceed 16.3 KiB)
-
-    *autorun_path*;;
-        Path for any scripts that should be run on startup
-
-    *chatlogs_path*;;
-        Default path for chatlogs. String value. Absolute path for chatlog files.
-
-    *password_eval*;;
-        Replace password prompt by running this command and using its output as
-	the password.
-
-*sounds*::
-    Configuration related to notification sounds.
-    Special value "silent" can be used to disable a specific notification. +
-    Each value is a string which corresponds to the absolute path of a wav
-    sound file.
-
-    *notif_error*;;
-        Sound to play when an error occurs.
-
-    *self_log_in*;;
-        Sound to play when you log in.
-
-    *self_log_out*;;
-        Sound to play when you log out.
-
-    *user_log_in*;;
-        Sound to play when a contact become online.
-
-    *user_log_out*;;
-        Sound to play when a contact become offline.
-
-    *call_incoming*;;
-        Sound to play when you receive an incoming call.
-
-    *call_outgoing*;;
-        Sound to play when you start a call.
-
-    *generic_message*;;
-        Sound to play when an event occurs.
-
-    *transfer_pending*;;
-        Sound to play when you receive a file transfer request.
-
-    *transfer_completed*;;
-        Sound to play when a file transfer is completed.
-
-*keys*::
-    Configuration related to user interface interaction.
-    Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN. +
-    Each value is a string which corresponds to a key combination.
-
-    *next_tab*;;
-        Key combination to switch next tab.
-
-    *prev_tab*;;
-        Key combination to switch previous tab.
-
-    *scroll_line_up*;;
-        Key combination to scroll one line up.
-
-    *scroll_line_down*;;
-        Key combination to scroll one line down.
-
-    *half_page_up*;;
-        Key combination to scroll half page up.
-
-    *half_page_down*;;
-        Key combination to scroll half page down.
-
-    *page_bottom*;;
-        Key combination to scroll to page bottom.
-
-    *toggle_peerlist*;;
-        Toggle the peer list on and off.
-
-    *toggle_paste_mode*;;
-        Toggle treating linebreaks as enter key press.
-
-
-FILES
------
-~/.config/tox/toxic.conf::
-    Main configuration file.
-
-{datadir}/toxic.conf.example::
-    Configuration example.
-
-RESOURCES
----------
-Project page: <https://github.com/JFreegman/toxic>
-
-Tox development group public key: 360497DA684BCE2A500C1AF9B3A5CE949BBB9F6FB1F91589806FB04CA039E313
-
-AUTHORS
--------
-JFreegman <JFreegman@gmail.com>
-
-SEE ALSO
---------
-*toxic*(1)
-
-
-

fun/unixtime.patch

@@ -0,0 +1,52 @@
+--- /src/misc_tools.c
++++ /src/misc_tools.c
+@@ -54,24 +54,11 @@
+     return val;
+ }
+ 
+-/* Get the current local time */
+-struct tm *get_time(void)
+-{
+-    struct tm *timeinfo;
+-    time_t now;
+-    time(&now);
+-    timeinfo = localtime(&now);
+-    return timeinfo;
+-}
+-
+ /* Prints the time to given window */
+ void print_time(WINDOW *window)
+ {
+-    uint8_t s[MAX_STR_SIZE];
+-    strftime(s, MAX_STR_SIZE, "[%H:%M:%S] ", get_time());
+-
+     wattron(window, COLOR_PAIR(BLUE));
+-    wprintw(window, "%s", s);
++    wprintw(window, "[%d] ", (int)time(NULL));
+     wattroff(window,COLOR_PAIR(BLUE));
+ }
+ 
+--- /src/log.c
++++ /src/log.c
+@@ -51,9 +51,7 @@
+         sprintf(&ident[2], "%02X", key[2] & 0xff);
+         ident[KEY_IDENT_DIGITS*2+1] = '\0';
+     } else {
+-        uint8_t s[MAX_STR_SIZE];
+-        strftime(s, MAX_STR_SIZE, "%Y-%m-%d[%H:%M:%S]", get_time());
+-        snprintf(ident, sizeof(ident), "%s", s);
++        snprintf(ident, sizeof(ident), "[%d]", (int)time(NULL));
+         path_len += strlen(ident) + 1;
+     }
+ 
+@@ -95,9 +93,7 @@
+     else
+         snprintf(name_frmt, sizeof(name_frmt), "%s:", name);
+ 
+-    uint8_t s[MAX_STR_SIZE];
+-    strftime(s, MAX_STR_SIZE, "%Y/%m/%d [%H:%M:%S]", get_time());
+-    fprintf(log->file,"%s %s %s\n", s, name_frmt, msg);
++    fprintf(log->file,"[%d]\n", (int)time(NULL), name_frmt, msg);
+ 
+     uint64_t curtime = (uint64_t) time(NULL);
+ 

m4/ax_pthread.m4

@@ -0,0 +1,317 @@
+# ===========================================================================
+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro figures out how to build C programs using POSIX threads. It
+#   sets the PTHREAD_LIBS output variable to the threads library and linker
+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+#   flags that are needed. (The user can also force certain compiler
+#   flags/libs to be tested by setting these environment variables.)
+#
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also link it with them as well. e.g. you should link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threads programs, you may wish to use these
+#   variables in your default LIBS, CFLAGS, and CC:
+#
+#     LIBS="$PTHREAD_LIBS $LIBS"
+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#     CC="$PTHREAD_CC"
+#
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+#   PTHREAD_CFLAGS.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or if
+#   you have any other suggestions or comments. This macro was based on work
+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
+#   grateful for the helpful feedback of numerous users.
+#
+#   Updated for Autoconf 2.68 by Daniel Richard G.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 20
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_PUSH([C])
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+        AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
+        AC_MSG_RESULT($ax_pthread_ok)
+        if test x"$ax_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+#      ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case ${host_os} in
+        solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+
+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+        ;;
+
+        darwin*)
+        ax_pthread_flags="-pthread $ax_pthread_flags"
+        ;;
+esac
+
+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_pthread_flags; do
+
+        case $flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
+                if test x"$ax_pthread_config" = xno; then continue; fi
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+                [ax_pthread_ok=yes],
+                [])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        AC_MSG_RESULT($ax_pthread_ok)
+        if test "x$ax_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        AC_MSG_CHECKING([for joinable pthread attribute])
+        attr_name=unknown
+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                           [int attr = $attr; return attr /* ; */])],
+                [attr_name=$attr; break],
+                [])
+        done
+        AC_MSG_RESULT($attr_name)
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+                               [Define to necessary symbol if this constant
+                                uses a non-standard name on your system.])
+        fi
+
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case ${host_os} in
+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+            osf* | hpux*) flag="-D_REENTRANT";;
+            solaris*)
+            if test "$GCC" = "yes"; then
+                flag="-D_REENTRANT"
+            else
+                flag="-mt -D_REENTRANT"
+            fi
+            ;;
+        esac
+        AC_MSG_RESULT(${flag})
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+            ax_cv_PTHREAD_PRIO_INHERIT, [
+                AC_LINK_IFELSE([
+                    AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
+            AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.]))
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != xyes; then
+            case $host_os in
+                aix*)
+                AS_CASE(["x/$CC"],
+                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                  [#handle absolute path differently from PATH based program lookup
+                   AS_CASE(["x$CC"],
+                     [x/*],
+                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                ;;
+            esac
+        fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$ax_pthread_ok" = xyes; then
+        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+        :
+else
+        ax_pthread_ok=no
+        $2
+fi
+AC_LANG_POP
+])dnl AX_PTHREAD

m4/pkg.m4

@@ -0,0 +1,199 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR

misc/DHTnodes

@@ -0,0 +1,8 @@
+192.254.75.98 33445 951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F
+37.187.46.132 33445 A9D98212B3F972BD11DA52BEB0658C326FCCC1BFD49F347F9C2D3D8B61E1B927
+144.76.60.215 33445 04119E835DF3E78BACF0F84235B300546AF8B936F035185E2A8E9E0A67C8924F
+23.226.230.47 33445 A09162D68618E742FFBCA1C2C70385E6679604B2D80EA6E84AD0996A1AC8A074
+37.187.20.216 33445 4FD54CFD426A338399767E56FD0F44F5E35FA8C38C8E87C8DC3FEAC0160F8E17    
+54.199.139.199 33445 7F9C31FE850E97CEFD4C4591DF93FC757C7C12549DDD55F8EEAECC34FE76C029    
+109.169.46.133 33445 7F31BFC93B8E4016A902144D0B110C3EA97CB7D43F1C4D21BCAE998A7C838821
+192.210.149.121 33445 F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67    

misc/Makefile.am

@@ -0,0 +1 @@
+dist_pkgdata_DATA = DHTnodes

misc/toxic.conf

@@ -0,0 +1,23 @@
+# 24 or 12 hour time
+time:24;
+
+# 1 to enable autologging, 0 to disable
+autolog:0;
+
+# 1 to disbale terminal alerts on messages, 0 to enable
+disable_alerts:0;
+
+# maximum lines for chat window history
+history_size:700;
+
+# 1 to use native terminal colours, 0 to use toxic default colour theme
+colour_theme:0;
+
+# preferred audio input device; numbers correspond to /lsdev in
+audio_in_dev:0;
+
+# preferred audio output device; numbers correspond to /lsdev out
+audio_out_dev:0;
+
+# preferred path for downloads
+download_path:/home/USERNAME/Downloads/;

misc/toxic.conf.example

@@ -1,157 +0,0 @@
-// SAMPLE TOXIC CONFIGURATION
-// USES LIBCONFIG-ACCEPTED SYNTAX
-
-ui = {
-  // true to enable timestamps, false to disable
-  timestamps=true;
-
-  // true to enable acoustic alerts on messages, false to disable
-  alerts=true;
-
-  // Output a bell when receiving a message (see manpage)
-  bell_on_message=true;
-
-  // Output a bell when receiving a filetransfer (see manpage)
-  bell_on_filetrans=true;
-
-  // Don't output a bell when a filetransfer was accepted (see manpage)
-  bell_on_filetrans_accept=false;
-
-  // Output a bell when receiving a group/call invite (see manpage)
-  bell_on_invite=true;
-
-  // true to use native terminal colours, false to use toxic default colour theme
-  native_colors=false;
-
-  // set background color of chat status bars (black, white, red, green, blue, cyan, yellow, magenta)
-  color_bar_bg="blue";
-
-  // set foreground (text) color of chat status bars (black, white, red, green, blue, cyan, yellow, magenta)
-  color_bar_fg="white";
-
-  // set foreground accent color of chat status bars (black, white, red, green, blue, cyan, yellow, magenta)
-  color_bar_accent="cyan";
-
-  // set foreground notify (and typing) color in chat status bar (black, white, red, green, blue, cyan, yellow, magenta)
-  color_bar_notify="yellow";
-
-  // true to enable autologging, false to disable
-  autolog=false;
-
-  // 24 or 12 hour time
-  time_format=24;
-
-  // Timestamp format string according to date/strftime format. Overrides time_format setting
-  timestamp_format="%H:%M";
-
-  // true to show you when others are typing a message in 1-on-1 chats
-  show_typing_other=true;
-
-  // true to show others when you're typing a message in 1-on-1 chats
-  show_typing_self=true;
-
-  // true to show the welcome message on startup
-  show_welcome_msg=true;
-
-  // true to show friend connection change messages on the home screen
-  show_connection_msg=true;
-
-  // true to show peer connection change messages in groups (setting to false does not include user quit messages)
-  show_group_connection_msg=true;
-
-  // How often in days to update the DHT nodes list. (0 to disable updates)
-  nodeslist_update_freq=7;
-
-  // How often in seconds to auto-save the Tox data file. (0 to disable periodic auto-saves)
-  autosave_freq=600;
-
-  // maximum lines for chat window history
-  history_size=700;
-
-  // time in milliseconds to display a notification
-  notification_timeout=6000;
-
-  // Indicator for display when someone connects or joins a group
-  line_join="-->";
-
-  // Indicator for display when someone disconnects or leaves a group
-  line_quit="<--";
-
-  // Indicator for alert messages.
-  line_alert="-!-";
-
-  // Indicator for normal messages.
-  line_normal="-";
-
-  // Indicator for special messages.
-  line_special=">";
-
-  // true to change status based on screen/tmux attach/detach, false to disable
-  mplex_away=true;
-
-  // Status message to use when status set to away due to screen/tmux detach
-  mplex_away_note="Away from keyboard, be back soon!"
-
-  // Parting message that will be sent to all groupchat peers when you leave the group
-  group_part_message="Toxic user signing out"
-};
-
-audio = {
-  // preferred audio input device; numbers correspond to /lsdev in
-  input_device=2;
-
-  // preferred audio output device; numbers correspond to /lsdev out
-  output_device=0;
-
-  // default VAD threshold; float (recommended values are 1.0-40.0)
-  VAD_threshold=5.0;
-
-  // Number of channels to use for conference audio broadcasts; 1 for mono, 2 for stereo.
-  conference_audio_channels=1;
-
-  // Number of channels to use for 1-on-1 audio broadcasts; 1 for mono, 2 for stereo.
-  chat_audio_channels=2;
-
-  // toggle conference push-to-talk
-  push_to_talk=false;
-};
-
-tox = {
-  // Path for downloaded files
-  // download_path="/home/USERNAME/Downloads/";
-
-  // Path for your avatar (file must be a .png and cannot exceed 64 KiB)
-  // avatar_path="/home/USERNAME/Pictures/youravatar.png";
-
-  // Path for scripts that should be run on startup
-  // autorun_path="/home/USERNAME/toxic_scripts/";
-
-  // Path for chatlogs
-  // chatlogs_path="/home/USERNAME/toxic_chatlogs/";
-};
-
-// To disable a sound set the path to "silent"
-sounds = {
-  error="__DATADIR__/sounds/ToxicError.wav";
-  user_log_in="__DATADIR__/sounds/ToxicContactOnline.wav";
-  user_log_out="__DATADIR__/sounds/ToxicContactOffline.wav";
-  call_incoming="__DATADIR__/sounds/ToxicIncomingCall.wav";
-  call_outgoing="__DATADIR__/sounds/ToxicOutgoingCall.wav";
-  generic_message="__DATADIR__/sounds/ToxicRecvMessage.wav";
-  transfer_pending="__DATADIR__/sounds/ToxicTransferStart.wav";
-  transfer_completed="__DATADIR__/sounds/ToxicTransferComplete.wav";
-};
-
-// Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN (case insensitive)
-// Note: Ctrl+M does not work
-keys = {
-  next_tab="Ctrl+P";
-  prev_tab="Ctrl+O";
-  scroll_line_up="PAGEUP";
-  scroll_line_down="PAGEDOWN";
-  half_page_up="Ctrl+F";
-  half_page_down="Ctrl+V";
-  page_bottom="Ctrl+H";
-  toggle_peerlist="Ctrl+B";
-  toggle_paste_mode="Ctrl+T";
-};

misc/toxic.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Toxic
-Comment=A CLI based Tox client
-TryExec=toxic
-Exec=toxic
-Icon=utilities-terminal
-Categories=InstantMessaging;AudioVideo;Network;
-Terminal=true
-MimeType=x-scheme-handler/tox;

script/build-minimal-static-toxic.sh

@@ -1,320 +0,0 @@
-#!/usr/bin/env sh
-
-# MIT License
-#
-# Copyright (c) 2021-2022 Maxim Biro <nurupo.contributions@gmail.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# Script for building a minimal statically compiled Toxic. While it doesn't
-# support X11 integration, video/audio calls, desktop & sound notifications, QR
-# codes and Python scripting, it is rather portable.
-#
-# Run as:
-#
-#    sudo docker run -it --rm \
-#         -v /tmp/artifact:/artifact \
-#         -v /home/jfreegman/git/toxic:/toxic \
-#         amd64/alpine:latest \
-#         /bin/sh /toxic/script/build-minimal-static-toxic.sh
-#
-# that would use Toxic code from /home/jfreegman/git/toxic and place the build
-# artifact at /tmp/artifact.
-#
-# You can change between:
-#   amd64/alpine:latest,
-#   i386/alpine:latest,
-#   arm64v8/alpine:latest,
-#   arm32v7/alpine:latest,
-#   arm32v6/alpine:latest,
-#   ppc64le/alpine:latest,
-#   s390x/alpine:latest,
-#   etc.
-# as long as your system can run foreign architecture binaries, e.g. via qemu
-# static bins and binfmt (install qemu-user-static package on Debian/Ubuntu).
-#
-#
-# To debug, run:
-#
-#    sudo docker run -it --rm \
-#         -v /tmp/artifact:/artifact \
-#         -v /home/jfreegman/git/toxic:/toxic \
-#         amd64/alpine:latest \
-#         /bin/sh
-#    # sh /toxic/script/build-minimal-static-toxic.sh
-
-set -eu
-
-ARTIFACT_DIR="/artifact"
-TOXIC_SRC_DIR="/toxic"
-
-if [ ! -f /etc/os-release ] || ! grep -qi 'Alpine Linux' /etc/os-release
-then
-  echo "Error: This script expects to be run on Alpine Linux."
-  exit 1
-fi
-
-if [ ! -d "$ARTIFACT_DIR" ] || [ ! -d "$TOXIC_SRC_DIR" ]
-then
-  echo "Error: At least one of $ARTIFACT_DIR or $TOXIC_SRC_DIR directories inside the container is missing."
-  exit 1
-fi
-
-if [ "$(id -u)" != "0" ]
-then
-  echo "Error: This script expects to be run as root."
-  exit 1
-fi
-
-set -x
-
-# Use all cores for building
-MAKEFLAGS=j$(nproc)
-export MAKEFLAGS
-
-check_sha256()
-{
-  if ! ( echo "$1  $2" | sha256sum -cs - )
-  then
-    echo "Error: sha256 of $2 doesn't match the known one."
-    echo "Expected: $1  $2"
-    echo "Got: $(sha256sum "$2")"
-    exit 1
-  else
-    echo "sha256 matches the expected one: $1"
-  fi
-}
-
-apk update
-apk upgrade
-apk add \
-    brotli-dev \
-    brotli-static \
-    build-base \
-    cmake \
-    git \
-    libconfig-dev \
-    libconfig-static \
-    libsodium-dev \
-    libsodium-static \
-    linux-headers \
-    ncurses-dev \
-    ncurses-static \
-    ncurses-terminfo \
-    ncurses-terminfo-base \
-    nghttp2-dev \
-    nghttp2-static \
-    openssl-dev \
-    openssl-libs-static \
-    pkgconf \
-    wget \
-    xz \
-    zlib-dev \
-    zlib-static
-
-BUILD_DIR="/tmp/build"
-mkdir -p "$BUILD_DIR"
-
-
-# Build Toxcore
-cd "$BUILD_DIR"
-
-# The git hash of the c-toxcore version we're using
-TOXCORE_VERSION="172f279dc0647a538b30e62c96bab8bb1b0c8960"
-
-# The sha256sum of the c-toxcore tarball for TOXCORE_VERSION
-TOXCORE_HASH="9884d4ad9b80917e22495c2ebe7a76c509fb98c61031824562883225e66684ae"
-
-TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"
-
-wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/$TOXCORE_VERSION.tar.gz"
-check_sha256 "$TOXCORE_HASH" "$TOXCORE_FILENAME"
-
-tar -o -xf "$TOXCORE_FILENAME"
-rm "$TOXCORE_FILENAME"
-
-cd c-toxcore*
-mkdir -p "third_party" && cd "third_party"
-
-CMP_VERSION="074e0df43e8a61ea938c4f77f65d1fbccc0c3bf9"
-CMP_FILENAME="cmp-$CMP_VERSION.tar.gz"
-wget --timeout=10 -O "$CMP_FILENAME" "https://github.com/TokTok/cmp/archive/$CMP_VERSION.tar.gz"
-tar -o -xf "$CMP_FILENAME"
-
-mv cmp-*/* 'cmp/'
-cd ..
-
-cmake -B_build -H. \
-      -DUSE_TEST_NETWORK=OFF \
-      -DENABLE_STATIC=ON \
-      -DENABLE_SHARED=OFF \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DBUILD_TOXAV=OFF \
-      -DBOOTSTRAP_DAEMON=OFF \
-      -DDHT_BOOTSTRAP=OFF \
-      -DCMAKE_INSTALL_PREFIX="$BUILD_DIR/prefix-toxcore"
-cmake --build _build --target install
-
-
-# Build cURL
-# While Alpine does provide a static cURL build, it's not built with
-# --with-ca-fallback, which is needed for better cross-distro portability.
-# Basically, some distros put their ca-certificates in different places, and
-# with --with-ca-fallback we or the user can provide the cert bundle file
-# location with SSL_CERT_FILE env variable.
-cd "$BUILD_DIR"
-
-CURL_VERSION="7.88.1"
-CURL_HASH="cdb38b72e36bc5d33d5b8810f8018ece1baa29a8f215b4495e495ded82bbf3c7"
-CURL_FILENAME="curl-$CURL_VERSION.tar.gz"
-
-wget --timeout=10 -O "$CURL_FILENAME" "https://curl.haxx.se/download/$CURL_FILENAME"
-check_sha256 "$CURL_HASH" "$CURL_FILENAME"
-tar -xf curl*.tar.gz
-rm curl*.tar.gz
-cd curl*
-
-./configure \
-  --prefix="$BUILD_DIR/prefix-curl" \
-  --disable-shared \
-  --enable-static \
-  --without-ca-bundle \
-  --without-ca-path \
-  --with-ca-fallback \
-  --with-nghttp2 \
-  --with-brotli \
-  --with-openssl
-make
-make install
-sed -i 's|-lbrotlidec |-lbrotlidec -lbrotlicommon |g' $BUILD_DIR/prefix-curl/lib/pkgconfig/libcurl.pc
-
-
-# Build Toxic
-cd "$BUILD_DIR"
-cp -a "$TOXIC_SRC_DIR" toxic
-cd toxic
-
-if [ -z "$(git describe --tags --exact-match HEAD)" ]
-then
-  set +x
-  echo "Didn't find a git tag on the HEAD commit. You seem to be building an in-development release of Toxic rather than a release version." | fold -sw 80
-  printf "Do you wish to proceed? (y/N): "
-  read -r answer
-  if echo "$answer" | grep -v -iq "^y" ; then
-    echo "Exiting."
-    exit 1
-  fi
-  set -x
-fi
-
-sed -i 's|pkg-config|pkg-config --static|' cfg/global_vars.mk
-sed -i 's|<limits.h|<linux/limits.h|' src/*
-
-CFLAGS="-static" PKG_CONFIG_PATH="$BUILD_DIR/prefix-toxcore/lib64/pkgconfig:$BUILD_DIR/prefix-toxcore/lib/pkgconfig:$BUILD_DIR/prefix-curl/lib/pkgconfig" PREFIX="$BUILD_DIR/prefix-toxic" make \
-  DISABLE_X11=1 \
-  DISABLE_AV=1 \
-  DISABLE_SOUND_NOTIFY=1 \
-  DISABLE_QRCODE=1 \
-  DISABLE_QRPNG=1 \
-  DISABLE_DESKTOP_NOTIFY=1 \
-  ENABLE_PYTHON=0 \
-  ENABLE_RELEASE=1 \
-  ENABLE_ASAN=0 \
-  DISABLE_GAMES=0 \
-  install
-
-
-# Prepare the build artifact
-PREPARE_ARTIFACT_DIR="$BUILD_DIR/artifact"
-cp -a "$BUILD_DIR/prefix-toxic/bin" "$PREPARE_ARTIFACT_DIR"
-strip "$PREPARE_ARTIFACT_DIR"/*
-
-cp -a "$BUILD_DIR/toxic/misc"/* "$PREPARE_ARTIFACT_DIR"
-mv "$PREPARE_ARTIFACT_DIR/toxic.conf.example" "$PREPARE_ARTIFACT_DIR/toxic.conf"
-
-cp -aL /usr/share/terminfo "$PREPARE_ARTIFACT_DIR"
-
-echo "A minimal statically compiled Toxic.
-Doesn't support X11 integration, video/audio calls, desktop & sound
-notifications, QR codes and Python scripting.
-However, it is rather portable.
-
-Toxic $(git -C "$BUILD_DIR/toxic" describe --tags --exact-match HEAD) ($(git -C "$BUILD_DIR/toxic" rev-parse HEAD))
-
-Build date time: $(TZ=UTC date +"%Y-%m-%dT%H:%M:%S%z")
-
-OS:
-$(cat /etc/os-release)
-
-List of self-built software statically compiled into Toxic:
-libcurl $CURL_VERSION
-libtoxcore $TOXCORE_VERSION
-
-List of OS-packaged software statically compiled into Toxic:
-$(apk list -I | grep 'static' | sort -i)
-
-List of all packages installed during the build:
-$(apk list -I | sort -i)" > "$PREPARE_ARTIFACT_DIR/build_info"
-
-echo '#!/usr/bin/env sh
-
-DEBIAN_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
-RHEL_SSL_CERT_FILE=/etc/pki/tls/certs/ca-bundle.crt
-OPENSUSE_CERT_FILE=/etc/ssl/ca-bundle.pem
-
-if [ ! -f "$SSL_CERT_FILE" ] ; then
-  if [ -f "$DEBIAN_SSL_CERT_FILE" ] ; then
-    SSL_CERT_FILE="$DEBIAN_SSL_CERT_FILE"
-  elif [ -f "$RHEL_SSL_CERT_FILE" ] ; then
-    SSL_CERT_FILE="$RHEL_SSL_CERT_FILE"
-  elif [ -f "$OPENSUSE_CERT_FILE" ] ; then
-    SSL_CERT_FILE="$OPENSUSE_CERT_FILE"
-  fi
-fi
-
-if [ -z "$SSL_CERT_FILE" ] ; then
-  echo "Warning: Couldn'\''t find the SSL CA certificate store file." | fold -sw 80
-  echo
-  echo "Toxic uses HTTPS to download a list of DHT bootstrap nodes in order to connect to the Tox DHT. This functionality is optional, you should be able to use Toxic without it. If you choose to use Toxic without it, you might need to manually enter DHT bootstrap node information using the '\''/connect'\'' command in order to come online." | fold -sw 80
-  echo
-  echo "To fix this issue, install SSL CAs as provided by your Linux distribution, e.g. '\''ca-certificates'\'' package on Debian/Ubuntu. If it'\''s already installed and you still see this message, run this script with SSL_CERT_FILE variable set to point to the SSL CA certificate store file location. The file is usually named '\''ca-certificates.crt'\'' or '\''ca-bundle.pem'\''." | fold -sw 80
-  echo
-  printf "Do you wish to run Toxic without SSL CA certificate store file found? (y/N): "
-  read -r answer
-  if echo "$answer" | grep -v -iq "^y" ; then
-    echo "Exiting."
-    exit
-  fi
-fi
-
-cd "$(dirname -- $0)"
-
-SSL_CERT_FILE="$SSL_CERT_FILE" TERMINFO=./terminfo ./toxic -c toxic.conf' > "$PREPARE_ARTIFACT_DIR/run_toxic.sh"
-chmod a+x "$PREPARE_ARTIFACT_DIR/run_toxic.sh"
-
-
-# Tar it
-cd "$PREPARE_ARTIFACT_DIR"
-cd ..
-ARCH="$(tr '_' '-' < /etc/apk/arch)"
-ARTIFACT_NAME="toxic-minimal-static-musl_linux_$ARCH"
-mv "$PREPARE_ARTIFACT_DIR" "$PREPARE_ARTIFACT_DIR/../$ARTIFACT_NAME"
-tar -cJf "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_NAME"
-mv "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_DIR"
-chmod 777 -R "$ARTIFACT_DIR"

sounds/license

@@ -1,2 +0,0 @@
-ToxicError.wav, ToxicRecvMessage.wav, ToxicContactOffline.wav, ToxicIncomingCall.wav, ToxicTransferComplete.wav, ToxicContactOnline.wav, ToxicOutgoingCall.wav and ToxicTransferStart.wav
-are licensed under the "Creative Commons Attribution 3.0 Unported". All credit attributed to Jfreegman.

src/api.c

@@ -1,214 +0,0 @@
-/*  api.c
- *
- *
- *  Copyright (C) 2017 Jakob Kreuze <jakob@memeware.net>
- *
- *  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 <dirent.h>
-#include <stdint.h>
-
-#include <tox/tox.h>
-
-#include "execute.h"
-#include "friendlist.h"
-#include "line_info.h"
-#include "message_queue.h"
-#include "misc_tools.h"
-#include "settings.h"
-#include "toxic_strings.h"
-#include "windows.h"
-
-#ifdef PYTHON
-#include "python_api.h"
-
-Tox              *user_tox;
-static WINDOW    *cur_window;
-static ToxWindow *self_window;
-
-void api_display(const char *const msg)
-{
-    if (msg == NULL) {
-        return;
-    }
-
-    self_window = get_active_window();
-    line_info_add(self_window, NULL, NULL, NULL, SYS_MSG, 0, 0, msg);
-}
-
-FriendsList api_get_friendslist(void)
-{
-    return Friends;
-}
-
-char *api_get_nick(void)
-{
-    size_t   len  = tox_self_get_name_size(user_tox);
-    uint8_t *name = malloc(len + 1);
-
-    if (name == NULL) {
-        return NULL;
-    }
-
-    tox_self_get_name(user_tox, name);
-    name[len] = '\0';
-    return (char *) name;
-}
-
-Tox_User_Status api_get_status(void)
-{
-    return tox_self_get_status(user_tox);
-}
-
-char *api_get_status_message(void)
-{
-    size_t   len    = tox_self_get_status_message_size(user_tox);
-    uint8_t *status = malloc(len + 1);
-
-    if (status == NULL) {
-        return NULL;
-    }
-
-    tox_self_get_status_message(user_tox, status);
-    status[len] = '\0';
-    return (char *) status;
-}
-
-void api_send(const char *msg)
-{
-    if (msg == NULL || self_window->chatwin->cqueue == NULL) {
-        return;
-    }
-
-    char *name = api_get_nick();
-
-    if (name == NULL) {
-        return;
-    }
-
-    self_window = get_active_window();
-
-    snprintf((char *) self_window->chatwin->line, sizeof(self_window->chatwin->line), "%s", msg);
-    add_line_to_hist(self_window->chatwin);
-    int id = line_info_add(self_window, true, name, NULL, OUT_MSG, 0, 0, "%s", msg);
-    cqueue_add(self_window->chatwin->cqueue, msg, strlen(msg), OUT_MSG, id);
-    free(name);
-}
-
-void api_execute(const char *input, int mode)
-{
-    self_window = get_active_window();
-    execute(cur_window, self_window, user_tox, input, mode);
-}
-
-int do_plugin_command(int num_args, char (*args)[MAX_STR_SIZE])
-{
-    return do_python_command(num_args, args);
-}
-
-int num_registered_handlers(void)
-{
-    return python_num_registered_handlers();
-}
-
-int help_max_width(void)
-{
-    return python_help_max_width();
-}
-
-void draw_handler_help(WINDOW *win)
-{
-    python_draw_handler_help(win);
-}
-
-void cmd_run(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    FILE       *fp;
-    const char *error_str;
-
-    cur_window  = window;
-    self_window = self;
-
-    if (argc != 1) {
-        if (argc < 1) {
-            error_str = "Path must be specified.";
-        } else {
-            error_str = "Only one argument allowed.";
-        }
-
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, error_str);
-        return;
-    }
-
-    fp = fopen(argv[1], "r");
-
-    if (fp == NULL) {
-        error_str = "Path does not exist.";
-
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, error_str);
-        return;
-    }
-
-    run_python(fp, argv[1]);
-    fclose(fp);
-}
-
-void invoke_autoruns(WINDOW *window, ToxWindow *self)
-{
-    char abspath_buf[PATH_MAX + 256];
-    char err_buf[PATH_MAX + 128];
-
-    if (user_settings->autorun_path[0] == '\0') {
-        return;
-    }
-
-    DIR *d = opendir(user_settings->autorun_path);
-
-    if (d == NULL) {
-        snprintf(err_buf, sizeof(err_buf), "Autorun path does not exist: %s", user_settings->autorun_path);
-        api_display(err_buf);
-        return;
-    }
-
-    struct dirent *dir = NULL;
-
-    cur_window  = window;
-
-    self_window = self;
-
-    while ((dir = readdir(d)) != NULL) {
-        size_t path_len = strlen(dir->d_name);
-
-        if (!strcmp(dir->d_name + path_len - 3, ".py")) {
-            snprintf(abspath_buf, sizeof(abspath_buf), "%s%s", user_settings->autorun_path, dir->d_name);
-            FILE *fp = fopen(abspath_buf, "r");
-
-            if (fp == NULL) {
-                snprintf(err_buf, sizeof(err_buf), "Invalid path: %s", abspath_buf);
-                api_display(err_buf);
-                continue;
-            }
-
-            run_python(fp, abspath_buf);
-            fclose(fp);
-        }
-    }
-
-    closedir(d);
-}
-#endif /* PYTHON */

src/api.h

@@ -1,43 +0,0 @@
-/*  api.h
- *
- *
- *  Copyright (C) 2017 Jakob Kreuze <jakob@memeware.net>
- *
- *  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 API_H
-#define API_H
-
-#include "friendlist.h"
-#include "windows.h"
-
-void api_display(const char *const msg);
-FriendsList api_get_friendslist(void);
-char *api_get_nick(void);
-Tox_User_Status api_get_status(void);
-char *api_get_status_message(void);
-void api_send(const char *msg);
-void api_execute(const char *input, int mode);
-int do_plugin_command(int num_args, char (*args)[MAX_STR_SIZE]);
-int num_registered_handlers(void);
-int help_max_width(void);
-void draw_handler_help(WINDOW *win);
-void invoke_autoruns(WINDOW *w, ToxWindow *self);
-void cmd_run(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-
-#endif /* API_H */

src/audio_call.h

@@ -20,90 +20,37 @@
  *
  */
 
-#ifndef AUDIO_CALL_H
-#define AUDIO_CALL_H
+#ifndef _audio_h
+#define _audio_h
 
 #include <tox/toxav.h>
 
-#include "audio_device.h"
+#include "toxic.h"
+#include "windows.h"
 
-typedef enum AudioError {
-    ae_None = 0,
-    ae_StartingCaptureDevice = 1 << 0,
-    ae_StartingOutputDevice = 1 << 1,
-    ae_StartingCoreAudio = 1 << 2
+#define MAX_DEVICES 32
+
+typedef enum _AudioError {
+    NoError = 0,
+    ErrorStartingCaptureDevice = 1 << 0,
+    ErrorStartingOutputDevice = 1 << 1,
+    ErrorStartingCoreAudio = 1 << 2
 } AudioError;
 
-#ifdef VIDEO
-typedef enum VideoError {
-    ve_None = 0,
-    ve_StartingCaptureDevice = 1 << 0,
-    ve_StartingOutputDevice = 1 << 1,
-    ve_StartingCoreVideo = 1 << 2
-} VideoError;
+typedef enum _Devices {
+    input,
+    output,
+} _Devices;
 
-#endif /* VIDEO */
-
-/* Status transitions:
- * None -> Pending (call invitation made or received);
- * Pending -> None (invitation rejected or failed);
- * Pending -> Active (call starts);
- * Active -> None (call ends).
+/* You will have to pass pointer to first member of 'windows'
+ * declared in windows.c otherwise undefined behaviour will
  */
-typedef enum CallStatus {
-    cs_None = 0,
-    cs_Pending,
-    cs_Active
-} CallStatus;
+ToxAv *init_audio(ToxWindow *self, Tox *tox);
+void terminate_audio();
 
-typedef struct Call {
-    CallStatus status;
-    uint32_t state; /* ToxAV call state, valid when `status == cs_Active` */
-    uint32_t in_idx, out_idx; /* Audio device index, or -1 if not open */
-    uint32_t audio_bit_rate; /* Bit rate for sending audio */
+int errors();
 
-    uint32_t vin_idx, vout_idx; /* Video device index, or -1 if not open */
-    uint32_t video_width, video_height;
-    uint32_t video_bit_rate; /* Bit rate for sending video; 0 for no video */
-} Call;
+int start_transmission(ToxWindow *self);
+int device_set(ToxWindow *self, _Devices type, long int selection);
 
-struct CallControl {
-    AudioError audio_errors;
-#ifdef VIDEO
-    VideoError video_errors;
-#endif /* VIDEO */
-
-    ToxAV *av;
-    ToxWindow *prompt;
-
-    Call *calls;
-    uint32_t max_calls;
-
-    bool audio_enabled;
-    bool video_enabled;
-
-    int32_t audio_frame_duration;
-    uint32_t audio_sample_rate;
-    uint8_t audio_channels;
-    uint32_t default_audio_bit_rate;
-
-    int32_t video_frame_duration;
-    uint32_t default_video_width, default_video_height;
-    uint32_t default_video_bit_rate;
-};
-
-extern 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);
-void terminate_audio(void);
-
-bool init_call(Call *call);
-
-void place_call(ToxWindow *self);
-void stop_current_call(ToxWindow *self);
-
-void init_friend_AV(uint32_t index);
-void del_friend_AV(uint32_t index);
-
-#endif /* AUDIO_CALL_H */
+#endif /* _audio_h */

src/audio_device.c

@@ -1,788 +0,0 @@
-/*  audio_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 "audio_device.h"
-
-#include "line_info.h"
-#include "misc_tools.h"
-#include "settings.h"
-
-#include <AL/al.h>
-#include <AL/alc.h>
-/* compatibility with older versions of OpenAL */
-#ifndef ALC_ALL_DEVICES_SPECIFIER
-#include <AL/alext.h>
-#endif /* ALC_ALL_DEVICES_SPECIFIER */
-
-#include <assert.h>
-#include <math.h>
-#include <pthread.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-extern struct user_settings *user_settings;
-extern struct Winthread Winthread;
-
-typedef struct FrameInfo {
-    uint32_t samples_per_frame;
-    uint32_t sample_rate;
-    bool stereo;
-} FrameInfo;
-
-/* A virtual input/output device, abstracting the currently selected openal
- * device (which may change during the lifetime of the virtual device).
- * We refer to a virtual device as a "device", and refer to an underlying
- * openal device as an "al_device".
- * Multiple virtual devices may be open at once; the callback of each virtual
- * input device has data captured from the input al_device passed to it, and
- * each virtual output device acts as a source for the output al_device.
- */
-typedef struct Device {
-    bool active;
-    bool muted;
-
-    FrameInfo frame_info;
-
-    // used only by input devices:
-    DataHandleCallback cb;
-    void *cb_data;
-    float VAD_threshold;
-    uint32_t VAD_samples_remaining;
-
-    // used only by output devices:
-    uint32_t source;
-    uint32_t buffers[OPENAL_BUFS];
-    bool source_open;
-} Device;
-
-typedef struct AudioState {
-    ALCdevice *al_device[2];
-
-    Device devices[2][MAX_DEVICES];
-    uint32_t num_devices[2];
-
-    FrameInfo capture_frame_info;
-    float input_volume;
-
-    // mutexes to prevent changes to input resp. output devices and al_devices
-    // during poll_input iterations resp. calls to write_out;
-    // mutex[input] also used to lock input_volume which poll_input writes to.
-    pthread_mutex_t mutex[2];
-
-    // TODO: unused
-    const char *default_al_device_name[2];              /* Default devices */
-
-    const char *al_device_names[2][MAX_OPENAL_DEVICES]; /* Available devices */
-    uint32_t num_al_devices[2];
-    char *current_al_device_name[2];
-} AudioState;
-
-static AudioState *audio_state;
-
-static void lock(DeviceType type)
-{
-    pthread_mutex_lock(&audio_state->mutex[type]);
-}
-
-static void unlock(DeviceType type)
-{
-    pthread_mutex_unlock(&audio_state->mutex[type]);
-}
-
-
-static bool thread_running = true,
-            thread_paused = true;               /* Thread control */
-
-#ifdef AUDIO
-static void *poll_input(void *);
-#endif
-
-static uint32_t sound_mode(bool stereo)
-{
-    return stereo ? AL_FORMAT_STEREO16 : AL_FORMAT_MONO16;
-}
-
-static uint32_t sample_size(bool stereo)
-{
-    return stereo ? 4 : 2;
-}
-
-DeviceError init_devices(void)
-{
-    audio_state = calloc(1, sizeof(AudioState));
-
-    if (audio_state == NULL) {
-        return de_InternalError;
-    }
-
-    get_al_device_names();
-
-    for (DeviceType type = input; type <= output; ++type) {
-        audio_state->al_device[type] = NULL;
-
-        if (pthread_mutex_init(&audio_state->mutex[type], NULL) != 0) {
-            return de_InternalError;
-        }
-    }
-
-#ifdef AUDIO
-    // Start poll thread
-    pthread_t thread_id;
-
-    if (pthread_create(&thread_id, NULL, poll_input, NULL) != 0
-            || pthread_detach(thread_id) != 0) {
-        return de_InternalError;
-    }
-
-#endif
-
-    return de_None;
-}
-
-DeviceError terminate_devices(void)
-{
-    lock(input);
-    thread_running = false;
-    unlock(input);
-
-    sleep_thread(20000L);
-
-    for (DeviceType type = input; type <= output; ++type) {
-        if (pthread_mutex_destroy(&audio_state->mutex[type]) != 0) {
-            return de_InternalError;
-        }
-
-        if (audio_state->current_al_device_name[type] != NULL) {
-            free(audio_state->current_al_device_name[type]);
-        }
-    }
-
-    free(audio_state);
-
-    return de_None;
-}
-
-void get_al_device_names(void)
-{
-    const char *stringed_device_list;
-
-    for (DeviceType type = input; type <= output; ++type) {
-        audio_state->num_al_devices[type] = 0;
-
-        if (type == input) {
-            stringed_device_list = alcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER);
-        } else {
-            if (alcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT") != AL_FALSE) {
-                stringed_device_list = alcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
-            } else {
-                stringed_device_list = alcGetString(NULL, ALC_DEVICE_SPECIFIER);
-            }
-        }
-
-        if (stringed_device_list != NULL) {
-            audio_state->default_al_device_name[type] = alcGetString(NULL,
-                    type == input ? ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER : ALC_DEFAULT_DEVICE_SPECIFIER);
-
-            for (; *stringed_device_list != '\0'
-                    && audio_state->num_al_devices[type] < MAX_OPENAL_DEVICES; ++audio_state->num_al_devices[type]) {
-                audio_state->al_device_names[type][audio_state->num_al_devices[type]] = stringed_device_list;
-                stringed_device_list += strlen(stringed_device_list) + 1;
-            }
-        }
-    }
-}
-
-DeviceError device_mute(DeviceType type, uint32_t device_idx)
-{
-    if (device_idx >= MAX_DEVICES) {
-        return de_InvalidSelection;
-    }
-
-    Device *device = &audio_state->devices[type][device_idx];
-
-    if (!device->active) {
-        return de_DeviceNotActive;
-    }
-
-    lock(type);
-
-    device->muted = !device->muted;
-
-    unlock(type);
-    return de_None;
-}
-
-bool device_is_muted(DeviceType type, uint32_t device_idx)
-{
-    if (device_idx >= MAX_DEVICES) {
-        return false;
-    }
-
-    Device *device = &audio_state->devices[type][device_idx];
-
-    if (!device->active) {
-        return false;
-    }
-
-    return device->muted;
-}
-
-DeviceError device_set_VAD_threshold(uint32_t device_idx, float value)
-{
-    if (device_idx >= MAX_DEVICES) {
-        return de_InvalidSelection;
-    }
-
-    Device *device = &audio_state->devices[input][device_idx];
-
-    if (!device->active) {
-        return de_DeviceNotActive;
-    }
-
-    if (value <= 0.0f) {
-        value = 0.0f;
-    }
-
-    lock(input);
-
-    device->VAD_threshold = value;
-
-    unlock(input);
-    return de_None;
-}
-
-float device_get_VAD_threshold(uint32_t device_idx)
-{
-    if (device_idx >= MAX_DEVICES) {
-        return 0.0;
-    }
-
-    Device *device = &audio_state->devices[input][device_idx];
-
-    if (!device->active) {
-        return 0.0;
-    }
-
-    return device->VAD_threshold;
-}
-
-DeviceError set_source_position(uint32_t device_idx, float x, float y, float z)
-{
-    if (device_idx >= MAX_DEVICES) {
-        return de_InvalidSelection;
-    }
-
-    Device *device = &audio_state->devices[output][device_idx];
-
-    if (!device->active) {
-        return de_DeviceNotActive;
-    }
-
-    lock(output);
-
-    alSource3f(device->source, AL_POSITION, x, y, z);
-
-    unlock(output);
-
-    if (!audio_state->al_device[output] || alcGetError(audio_state->al_device[output]) != AL_NO_ERROR) {
-        return de_AlError;
-    }
-
-    return de_None;
-}
-
-static DeviceError close_al_device(DeviceType type)
-{
-    if (audio_state->al_device[type] == NULL) {
-        return de_None;
-    }
-
-    if (type == input) {
-        if (!alcCaptureCloseDevice(audio_state->al_device[type])) {
-            return de_AlError;
-        }
-
-        thread_paused = true;
-    } else {
-        ALCcontext *context = alcGetCurrentContext();
-        alcMakeContextCurrent(NULL);
-        alcDestroyContext(context);
-
-        if (!alcCloseDevice(audio_state->al_device[type])) {
-            return de_AlError;
-        }
-    }
-
-    audio_state->al_device[type] = NULL;
-
-    return de_None;
-}
-
-static DeviceError open_al_device(DeviceType type, FrameInfo frame_info)
-{
-    audio_state->al_device[type] = type == input
-                                   ? alcCaptureOpenDevice(audio_state->current_al_device_name[type],
-                                           frame_info.sample_rate, sound_mode(frame_info.stereo), frame_info.samples_per_frame * 2)
-                                   : alcOpenDevice(audio_state->current_al_device_name[type]);
-
-    if (audio_state->al_device[type] == NULL) {
-        return de_FailedStart;
-    }
-
-    if (type == input) {
-        alcCaptureStart(audio_state->al_device[type]);
-        thread_paused = false;
-
-        audio_state->capture_frame_info = frame_info;
-    } else {
-        alcMakeContextCurrent(alcCreateContext(audio_state->al_device[type], NULL));
-    }
-
-    if (alcGetError(audio_state->al_device[type]) != AL_NO_ERROR) {
-        close_al_device(type);
-        return de_AlError;
-    }
-
-    return de_None;
-}
-
-static void close_source(Device *device)
-{
-    if (device->source_open) {
-        alDeleteSources(1, &device->source);
-        alDeleteBuffers(OPENAL_BUFS, device->buffers);
-
-        device->source_open = false;
-    }
-}
-
-static DeviceError open_source(Device *device)
-{
-    alGenBuffers(OPENAL_BUFS, device->buffers);
-
-    if (alcGetError(audio_state->al_device[output]) != AL_NO_ERROR) {
-        return de_FailedStart;
-    }
-
-    alGenSources((uint32_t)1, &device->source);
-
-    if (alcGetError(audio_state->al_device[output]) != AL_NO_ERROR) {
-        alDeleteBuffers(OPENAL_BUFS, device->buffers);
-        return de_FailedStart;
-    }
-
-    device->source_open = true;
-
-    alSourcei(device->source, AL_LOOPING, AL_FALSE);
-
-    const uint32_t frame_size = device->frame_info.samples_per_frame * sample_size(device->frame_info.stereo);
-    size_t zeros_size = frame_size * sizeof(uint16_t);
-    uint16_t *zeros = calloc(1, zeros_size);
-
-    if (zeros == NULL) {
-        close_source(device);
-        return de_FailedStart;
-    }
-
-    for (int i = 0; i < OPENAL_BUFS; ++i) {
-        alBufferData(device->buffers[i], sound_mode(device->frame_info.stereo), zeros,
-                     zeros_size, device->frame_info.sample_rate);
-    }
-
-    free(zeros);
-
-    alSourceQueueBuffers(device->source, OPENAL_BUFS, device->buffers);
-    alSourcePlay(device->source);
-
-    if (alcGetError(audio_state->al_device[output]) != AL_NO_ERROR) {
-        close_source(device);
-        return de_FailedStart;
-    }
-
-    return de_None;
-}
-
-DeviceError set_al_device(DeviceType type, int32_t selection)
-{
-    if (audio_state->num_al_devices[type] <= selection || selection < 0) {
-        return de_InvalidSelection;
-    }
-
-    const char *name = audio_state->al_device_names[type][selection];
-
-    char **cur_name = &audio_state->current_al_device_name[type];
-
-    if (*cur_name != NULL) {
-        free(*cur_name);
-    }
-
-    *cur_name = malloc(strlen(name) + 1);
-
-    if (*cur_name == NULL) {
-        return de_InternalError;
-    }
-
-    strcpy(*cur_name, name);
-
-    if (audio_state->num_devices[type] > 0) {
-        // close any existing al_device and try to open new one, reopening existing sources
-        lock(type);
-
-        if (type == output) {
-            for (int i = 0; i < MAX_DEVICES; i++) {
-                Device *device = &audio_state->devices[type][i];
-
-                if (device->active) {
-                    close_source(device);
-                }
-            }
-        }
-
-        close_al_device(type);
-
-        DeviceError err = open_al_device(type, audio_state->capture_frame_info);
-
-        if (err != de_None) {
-            unlock(type);
-            return err;
-        }
-
-        if (type == output) {
-            for (int i = 0; i < MAX_DEVICES; i++) {
-                Device *device = &audio_state->devices[type][i];
-
-                if (device->active) {
-                    open_source(device);
-                }
-            }
-        }
-
-        unlock(type);
-    }
-
-    return de_None;
-}
-
-static DeviceError open_device(DeviceType type, uint32_t *device_idx, DataHandleCallback cb, void *cb_data,
-                               uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
-{
-    if (channels != 1 && channels != 2) {
-        return de_UnsupportedMode;
-    }
-
-    const uint32_t samples_per_frame = (sample_rate * frame_duration / 1000);
-    FrameInfo frame_info = {samples_per_frame, sample_rate, channels == 2};
-
-    uint32_t i;
-
-    for (i = 0; i < MAX_DEVICES && audio_state->devices[type][i].active; ++i);
-
-    if (i == MAX_DEVICES) {
-        return de_AllDevicesBusy;
-    }
-
-    *device_idx = i;
-
-    lock(type);
-
-    if (audio_state->al_device[type] == NULL) {
-        DeviceError err = open_al_device(type, frame_info);
-
-        if (err != de_None) {
-            unlock(type);
-            return err;
-        }
-    } else if (type == input) {
-        // Use previously set frame info on existing capture device
-        frame_info = audio_state->capture_frame_info;
-    }
-
-    Device *device = &audio_state->devices[type][i];
-    device->active = true;
-    ++audio_state->num_devices[type];
-
-    device->muted = false;
-    device->frame_info = frame_info;
-
-    if (type == input) {
-        device->cb = cb;
-        device->cb_data = cb_data;
-#ifdef AUDIO
-
-        if (user_settings->VAD_threshold >= 0.0) {
-            device->VAD_threshold = user_settings->VAD_threshold;
-        }
-
-#else
-        device->VAD_threshold = 0.0f;
-#endif
-    } else {
-        if (open_source(device) != de_None) {
-            device->active = false;
-            --audio_state->num_devices[type];
-            unlock(type);
-            return de_FailedStart;
-        }
-    }
-
-    unlock(type);
-    return de_None;
-}
-
-DeviceError open_input_device(uint32_t *device_idx, DataHandleCallback cb, void *cb_data, uint32_t sample_rate,
-                              uint32_t frame_duration, uint8_t channels)
-{
-    return open_device(input, device_idx, cb, cb_data, sample_rate, frame_duration, channels);
-}
-
-DeviceError open_output_device(uint32_t *device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
-{
-    return open_device(output, device_idx, 0, 0, sample_rate, frame_duration, channels);
-}
-
-DeviceError close_device(DeviceType type, uint32_t device_idx)
-{
-    if (device_idx >= MAX_DEVICES) {
-        return de_InvalidSelection;
-    }
-
-    lock(type);
-
-    Device *device = &audio_state->devices[type][device_idx];
-
-    if (!device->active) {
-        unlock(type);
-        return de_DeviceNotActive;
-    }
-
-    if (type == output) {
-        close_source(device);
-    }
-
-    device->active = false;
-    --audio_state->num_devices[type];
-
-    DeviceError err = de_None;
-
-    if (audio_state->num_devices[type] == 0) {
-        err = close_al_device(type);
-    }
-
-    unlock(type);
-    return err;
-}
-
-DeviceError write_out(uint32_t device_idx, const int16_t *data, uint32_t sample_count, uint8_t channels,
-                      uint32_t sample_rate)
-{
-    if (device_idx >= MAX_DEVICES) {
-        return de_InvalidSelection;
-    }
-
-    lock(output);
-
-    Device *device = &audio_state->devices[output][device_idx];
-
-    if (!device->active || device->muted) {
-        unlock(output);
-        return de_DeviceNotActive;
-    }
-
-    ALuint bufid;
-    ALint processed, queued;
-    alGetSourcei(device->source, AL_BUFFERS_PROCESSED, &processed);
-    alGetSourcei(device->source, AL_BUFFERS_QUEUED, &queued);
-
-    if (audio_state->al_device[output] == NULL || alcGetError(audio_state->al_device[output]) != AL_NO_ERROR) {
-        unlock(output);
-        return de_AlError;
-    }
-
-    if (processed) {
-        ALuint *bufids = malloc(processed * sizeof(ALuint));
-
-        if (bufids == NULL) {
-            unlock(output);
-            return de_InternalError;
-        }
-
-        alSourceUnqueueBuffers(device->source, processed, bufids);
-        alDeleteBuffers(processed - 1, bufids + 1);
-        bufid = bufids[0];
-        free(bufids);
-    } else if (queued < 16) {
-        alGenBuffers(1, &bufid);
-    } else {
-        unlock(output);
-        return de_Busy;
-    }
-
-
-    const bool stereo = channels == 2;
-    alBufferData(bufid, sound_mode(stereo), data,
-                 sample_count * sample_size(stereo),
-                 sample_rate);
-    alSourceQueueBuffers(device->source, 1, &bufid);
-
-    ALint state;
-    alGetSourcei(device->source, AL_SOURCE_STATE, &state);
-
-    if (state != AL_PLAYING) {
-        alSourcePlay(device->source);
-    }
-
-    unlock(output);
-    return de_None;
-}
-
-#ifdef AUDIO
-/* Adapted from qtox,
- * Copyright © 2014-2019 by The qTox Project Contributors
- *
- * return normalized volume of buffer in range 0.0-100.0
- */
-float volume(int16_t *frame, uint32_t samples)
-{
-    float sum_of_squares = 0;
-
-    for (uint32_t i = 0; i < samples; i++) {
-        const float sample = (float)(frame[i]) / INT16_MAX;
-        sum_of_squares += powf(sample, 2);
-    }
-
-    const float root_mean_square = sqrtf(sum_of_squares / samples);
-    const float root_two = 1.414213562;
-
-    // normalizedVolume == 1.0 corresponds to a sine wave of maximal amplitude
-    const float normalized_volume = root_mean_square * root_two;
-
-    return 100.0f * fminf(1.0f, normalized_volume);
-}
-
-// Time in ms for which we continue to capture audio after VAD is triggered:
-#define VAD_TIME 250
-
-#define FRAME_BUF_SIZE 16000
-
-static void *poll_input(void *arg)
-{
-    UNUSED_VAR(arg);
-
-    int16_t *frame_buf = malloc(FRAME_BUF_SIZE * sizeof(int16_t));
-
-    if (frame_buf == NULL) {
-        exit_toxic_err("failed in thread_poll", FATALERR_MEMORY);
-    }
-
-    while (1) {
-        lock(input);
-
-        if (!thread_running) {
-            free(frame_buf);
-            unlock(input);
-            break;
-        }
-
-        if (thread_paused) {
-            unlock(input);
-            sleep_thread(10000L);
-            continue;
-        }
-
-        if (audio_state->al_device[input] != NULL) {
-            int32_t available_samples;
-            alcGetIntegerv(audio_state->al_device[input], ALC_CAPTURE_SAMPLES, sizeof(int32_t), &available_samples);
-
-            const uint32_t f_size = audio_state->capture_frame_info.samples_per_frame;
-
-            if (available_samples >= f_size && f_size <= FRAME_BUF_SIZE) {
-                alcCaptureSamples(audio_state->al_device[input], frame_buf, f_size);
-
-                unlock(input);
-                pthread_mutex_lock(&Winthread.lock);
-                lock(input);
-
-                float frame_volume = volume(frame_buf, f_size);
-
-                audio_state->input_volume = frame_volume;
-
-                for (int i = 0; i < MAX_DEVICES; i++) {
-                    Device *device = &audio_state->devices[input][i];
-
-                    if (device->VAD_threshold != 0.0f) {
-                        if (frame_volume >= device->VAD_threshold) {
-                            device->VAD_samples_remaining = VAD_TIME * (audio_state->capture_frame_info.sample_rate / 1000);
-                        } else if (device->VAD_samples_remaining < f_size) {
-                            continue;
-                        } else {
-                            device->VAD_samples_remaining -= f_size;
-                        }
-                    }
-
-                    if (device->active && !device->muted && device->cb) {
-                        device->cb(frame_buf, f_size, device->cb_data);
-                    }
-                }
-
-                pthread_mutex_unlock(&Winthread.lock);
-            }
-        }
-
-        unlock(input);
-        sleep_thread(5000L);
-    }
-
-    pthread_exit(NULL);
-}
-#endif
-
-float get_input_volume(void)
-{
-    float ret = 0.0f;
-
-    if (audio_state->al_device[input] != NULL) {
-        lock(input);
-        ret = audio_state->input_volume;
-        unlock(input);
-    }
-
-    return ret;
-}
-
-void print_al_devices(ToxWindow *self, DeviceType type)
-{
-    for (int i = 0; i < audio_state->num_al_devices[type]; ++i) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG,
-                      audio_state->current_al_device_name[type]
-                      && strcmp(audio_state->current_al_device_name[type], audio_state->al_device_names[type][i]) == 0 ? 1 : 0,
-                      0, "%d: %s", i, audio_state->al_device_names[type][i]);
-    }
-
-    return;
-}
-
-DeviceError selection_valid(DeviceType type, int32_t selection)
-{
-    return (audio_state->num_al_devices[type] <= selection || selection < 0) ? de_InvalidSelection : de_None;
-}

src/audio_device.h

@@ -1,95 +0,0 @@
-/*  audio_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/>.
- *
- */
-
-/*
- * You can have multiple sources (Input devices) but only one output device.
- * Pass buffers to output device via write();
- * Read from running input device(s) via select()/callback combo.
- */
-
-#ifndef AUDIO_DEVICE_H
-#define AUDIO_DEVICE_H
-
-#define OPENAL_BUFS 5
-#define MAX_OPENAL_DEVICES 32
-#define MAX_DEVICES 32
-
-#include "windows.h"
-
-typedef enum DeviceType {
-    input,
-    output,
-} DeviceType;
-
-typedef enum DeviceError {
-    de_None,
-    de_InternalError = -1,
-    de_InvalidSelection = -2,
-    de_FailedStart = -3,
-    de_Busy = -4,
-    de_AllDevicesBusy = -5,
-    de_DeviceNotActive = -6,
-    de_BufferError = -7,
-    de_UnsupportedMode = -8,
-    de_AlError = -9,
-} DeviceError;
-
-typedef void (*DataHandleCallback)(const int16_t *, uint32_t size, void *data);
-
-
-DeviceError init_devices(void);
-
-void get_al_device_names(void);
-DeviceError terminate_devices(void);
-
-/* toggle device mute */
-DeviceError device_mute(DeviceType type, uint32_t device_idx);
-
-bool device_is_muted(DeviceType type, uint32_t device_idx);
-
-DeviceError device_set_VAD_threshold(uint32_t device_idx, float value);
-
-float device_get_VAD_threshold(uint32_t device_idx);
-
-DeviceError set_source_position(uint32_t device_idx, float x, float y, float z);
-
-DeviceError set_al_device(DeviceType type, int32_t selection);
-
-/* Start device */
-DeviceError open_input_device(uint32_t *device_idx, DataHandleCallback cb, void *cb_data,
-                              uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
-DeviceError open_output_device(uint32_t *device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
-
-/* Stop device */
-DeviceError close_device(DeviceType type, uint32_t device_idx);
-
-/* Write data to output device */
-DeviceError write_out(uint32_t device_idx, const int16_t *data, uint32_t length, uint8_t channels,
-                      uint32_t sample_rate);
-
-/* return current input volume as float in range 0.0-100.0 */
-float get_input_volume(void);
-
-void print_al_devices(ToxWindow *self, DeviceType type);
-
-DeviceError selection_valid(DeviceType type, int32_t selection);
-#endif /* AUDIO_DEVICE_H */

src/autocomplete.c

@@ -1,393 +0,0 @@
-/*  autocomplete.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 <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __APPLE__
-#include <sys/types.h>
-#include <sys/dir.h>
-#else
-#include <dirent.h>
-#endif /* __APPLE__ */
-
-#include "configdir.h"
-#include "execute.h"
-#include "line_info.h"
-#include "misc_tools.h"
-#include "toxic.h"
-#include "windows.h"
-
-static void print_ac_matches(ToxWindow *self, Tox *m, char **list, size_t n_matches)
-{
-    if (m) {
-        execute(self->chatwin->history, self, m, "/clear", GLOBAL_COMMAND_MODE);
-    }
-
-    for (size_t i = 0; i < n_matches; ++i) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", list[i]);
-    }
-
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "");
-}
-
-/* puts match in match buffer. if more than one match, add first n chars that are identical.
- * e.g. if matches contains: [foo, foobar, foe] we put fo in match.
- *
- * Returns the length of the match.
- */
-static size_t get_str_match(ToxWindow *self, char *match, size_t match_sz, const char *const *matches, size_t n_items,
-                            size_t max_size)
-{
-    UNUSED_VAR(self);
-
-    if (n_items == 1) {
-        return snprintf(match, match_sz, "%s", matches[0]);
-    }
-
-    for (size_t i = 0; i < max_size; ++i) {
-        char ch1 = matches[0][i];
-
-        for (size_t j = 0; j < n_items; ++j) {
-            char ch2 = matches[j][i];
-
-            if (ch1 != ch2 || !ch1) {
-                snprintf(match, match_sz, "%s", matches[0]);
-                match[i] = '\0';
-                return i;
-            }
-        }
-    }
-
-    return snprintf(match, match_sz, "%s", matches[0]);
-}
-
-/*
- * Looks for all instances in list that begin with the last entered word in line according to pos,
- * then fills line with the complete word. e.g. "Hello jo" would complete the line
- * with "Hello john". If multiple matches, prints out all the matches and semi-completes line.
- *
- * `list` is a pointer to `n_items` strings. Each string in the list must be <= MAX_STR_SIZE.
- *
- * dir_search should be true if the line being completed is a file path.
- *
- * Returns the difference between the old len and new len of line on success.
- * Returns -1 on error.
- *
- * Note: This function should not be called directly. Use complete_line() and complete_path() instead.
- */
-static int complete_line_helper(ToxWindow *self, const char *const *list, const size_t n_items, bool dir_search)
-{
-    ChatContext *ctx = self->chatwin;
-
-    if (ctx->pos <= 0 || ctx->len <= 0 || ctx->pos > ctx->len) {
-        return -1;
-    }
-
-    if (ctx->len >= MAX_STR_SIZE) {
-        return -1;
-    }
-
-    const char *endchrs = " ";
-    char ubuf[MAX_STR_SIZE];
-
-    /* work with multibyte string copy of buf for simplicity */
-    if (wcs_to_mbs_buf(ubuf, ctx->line, sizeof(ubuf)) == -1) {
-        return -1;
-    }
-
-    /* isolate substring from space behind pos to pos */
-    char tmp[MAX_STR_SIZE];
-    memcpy(tmp, ubuf, ctx->pos);
-    tmp[ctx->pos] = 0;
-
-    const char *s = dir_search ? strchr(tmp, ' ') : strrchr(tmp, ' ');
-    char *sub = calloc(1, strlen(ubuf) + 1);
-
-    if (sub == NULL) {
-        exit_toxic_err("failed in complete_line_helper", FATALERR_MEMORY);
-    }
-
-    if (!s && !dir_search) {
-        strcpy(sub, tmp);
-
-        if (sub[0] != '/') {
-            endchrs = ": ";
-        }
-    } else if (s) {
-        strcpy(sub, &s[1]);
-
-        if (dir_search) {
-            int sub_len = strlen(sub);
-            int si = char_rfind(sub, '/', sub_len);
-
-            if (si || *sub == '/') {
-                memmove(sub, &sub[si + 1], sub_len - si);
-            }
-        }
-    }
-
-    if (!sub[0] && !(dir_search && n_items == 1)) {
-        free(sub);
-        return 0;
-    }
-
-    int s_len = strlen(sub);
-    size_t n_matches = 0;
-
-    char **matches = (char **) malloc_ptr_array(n_items, MAX_STR_SIZE);
-
-    if (matches == NULL) {
-        free(sub);
-        return -1;
-    }
-
-    /* put all list matches in matches array */
-    for (size_t i = 0; i < n_items; ++i) {
-        if (strncmp(list[i], sub, s_len) == 0) {
-            snprintf(matches[n_matches++], MAX_STR_SIZE, "%s", list[i]);
-        }
-    }
-
-    free(sub);
-
-    if (!n_matches) {
-        free_ptr_array((void **) matches);
-        return -1;
-    }
-
-    if (!dir_search && n_matches > 1) {
-        print_ac_matches(self, NULL, matches, n_matches);
-    }
-
-    char match[MAX_STR_SIZE];
-    size_t match_len = get_str_match(self, match, sizeof(match), (const char *const *) matches, n_matches, MAX_STR_SIZE);
-
-    free_ptr_array((void **) matches);
-
-    if (match_len == 0) {
-        return 0;
-    }
-
-    if (dir_search) {
-        if (n_matches == 1) {
-            endchrs = char_rfind(match, '.', match_len) ? "" : "/";
-        } else {
-            endchrs = "";
-        }
-    } else if (n_matches > 1) {
-        endchrs = "";
-    }
-
-    /* put match in correct spot in buf and append endchars */
-    int n_endchrs = strlen(endchrs);
-    int strt = ctx->pos - s_len;
-    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);
-
-    /* If path points to a file with no extension don't append a forward slash */
-    if (dir_search && *endchrs == '/') {
-        const char *path_start = strchr(ubuf + 1, '/');
-
-        if (!path_start) {
-            path_start = strchr(ubuf + 1, ' ');
-
-            if (!path_start) {
-                return -1;
-            }
-        }
-
-        if (strlen(path_start) < 2) {
-            return -1;
-        }
-
-        ++path_start;
-
-        if (file_type(path_start) == FILE_TYPE_REGULAR) {
-            endchrs = "";
-            diff -= n_endchrs;
-        }
-    }
-
-    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];
-
-    if (mbs_to_wcs_buf(newbuf, ubuf, sizeof(newbuf) / sizeof(wchar_t)) == -1) {
-        return -1;
-    }
-
-    wcscpy(ctx->line, newbuf);
-
-    ctx->len += diff;
-    ctx->pos += diff;
-
-    return diff;
-}
-
-int complete_line(ToxWindow *self, const char *const *list, size_t n_items)
-{
-    return complete_line_helper(self, list, n_items, false);
-}
-
-static int complete_path(ToxWindow *self, const char *const *list, const size_t n_items)
-{
-    return complete_line_helper(self, list, n_items, true);
-}
-
-/* Transforms a tab complete starting with the shorthand "~" into the full home directory. */
-static void complete_home_dir(ToxWindow *self, char *path, int pathsize, const char *cmd, int cmdlen)
-{
-    ChatContext *ctx = self->chatwin;
-
-    char homedir[MAX_STR_SIZE] = {0};
-    get_home_dir(homedir, sizeof(homedir));
-
-    char newline[MAX_STR_SIZE + 1];
-    snprintf(newline, sizeof(newline), "%s %s%s", cmd, homedir, path + 1);
-    snprintf(path, pathsize, "%s", &newline[cmdlen - 1]);
-
-    wchar_t wline[MAX_STR_SIZE];
-
-    if (mbs_to_wcs_buf(wline, newline, sizeof(wline) / sizeof(wchar_t)) == -1) {
-        return;
-    }
-
-    int newlen = wcslen(wline);
-
-    if (ctx->len + newlen >= MAX_STR_SIZE) {
-        return;
-    }
-
-    wmemcpy(ctx->line, wline, newlen + 1);
-    ctx->pos = newlen;
-    ctx->len = ctx->pos;
-}
-
-/*
- * Return true if the first `p_len` chars in `s` are equal to `p` and `s` is a valid directory name.
- */
-static bool is_partial_match(const char *s, const char *p, size_t p_len)
-{
-    if (s == NULL || p == NULL) {
-        return false;
-    }
-
-    return strncmp(s, p, p_len) == 0 && strcmp(".", s) != 0 && strcmp("..", s) != 0;
-}
-
-/* Attempts to match /command "<incomplete-dir>" line to matching directories.
- * If there is only one match the line is auto-completed.
- *
- * Returns the diff between old len and new len of ctx->line on success.
- * Returns -1 if no matches or more than one match.
- */
-#define MAX_DIRS 75
-int dir_match(ToxWindow *self, Tox *m, const wchar_t *line, const wchar_t *cmd)
-{
-    char b_path[MAX_STR_SIZE + 1];
-    char b_name[MAX_STR_SIZE + 1];
-    char b_cmd[MAX_STR_SIZE];
-    const wchar_t *tmpline = &line[wcslen(cmd) + 1];   /* start after "/command " */
-
-    if (wcs_to_mbs_buf(b_path, tmpline, sizeof(b_path) - 1) == -1) {
-        return -1;
-    }
-
-    if (wcs_to_mbs_buf(b_cmd, cmd, sizeof(b_cmd)) == -1) {
-        return -1;
-    }
-
-    if (b_path[0] == '~') {
-        complete_home_dir(self, b_path, sizeof(b_path) - 1, b_cmd, strlen(b_cmd) + 2);
-    }
-
-    int si = char_rfind(b_path, '/', strlen(b_path));
-
-    if (!b_path[0]) {    /* list everything in pwd */
-        b_path[0] = '.';
-        b_path[1] = '\0';
-    } else if (!si && b_path[0] != '/') {    /* look for matches in pwd */
-        memmove(b_path + 1, b_path, sizeof(b_path) - 1);
-        b_path[0] = '.';
-    }
-
-    snprintf(b_name, sizeof(b_name), "%s", &b_path[si + 1]);
-    b_path[si + 1] = '\0';
-    size_t b_name_len = strlen(b_name);
-    DIR *dp = opendir(b_path);
-
-    if (dp == NULL) {
-        return -1;
-    }
-
-    char **dirnames = (char **) malloc_ptr_array(MAX_DIRS, NAME_MAX + 1);
-
-    if (dirnames == NULL) {
-        closedir(dp);
-        return -1;
-    }
-
-    struct dirent *entry;
-
-    int dircount = 0;
-
-    while ((entry = readdir(dp)) && dircount < MAX_DIRS) {
-        if (is_partial_match(entry->d_name, b_name, b_name_len)) {
-            snprintf(dirnames[dircount], NAME_MAX + 1, "%s", entry->d_name);
-            ++dircount;
-        }
-    }
-
-    closedir(dp);
-
-    if (dircount == 0) {
-        free_ptr_array((void **) dirnames);
-        return -1;
-    }
-
-    if (dircount > 1) {
-        qsort(dirnames, dircount, sizeof(char *), qsort_ptr_char_array_helper);
-        print_ac_matches(self, m, dirnames, dircount);
-    }
-
-    int ret = complete_path(self, (const char *const *) dirnames, dircount);
-
-    free_ptr_array((void **) dirnames);
-
-    return ret;
-}

src/autocomplete.h

@@ -1,52 +0,0 @@
-/*  autocomplete.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 AUTOCOMPLETE_H
-#define AUTOCOMPLETE_H
-
-#include "windows.h"
-
-/*
- * Looks for all instances in list that begin with the last entered word in line according to pos,
- * then fills line with the complete word. e.g. "Hello jo" would complete the line
- * with "Hello john". If multiple matches, prints out all the matches and semi-completes line.
- *
-* `list` is a pointer to `n_items` strings.
- *
- * dir_search should be true if the line being completed is a file path.
- *
- * Returns the difference between the old len and new len of line on success.
- * Returns -1 on error.
- *
- * Note: This function should not be called directly. Use complete_line() and complete_path() instead.
- */
-int complete_line(ToxWindow *self, const char **list, size_t n_items);
-
-/* Attempts to match /command "<incomplete-dir>" line to matching directories.
- * If there is only one match the line is auto-completed.
- *
- * Returns the diff between old len and new len of ctx->line on success.
- * Returns -1 if no matches or more than one match.
- */
-int dir_match(ToxWindow *self, Tox *m, const wchar_t *line, const wchar_t *cmd);
-
-#endif /* AUTOCOMPLETE_H */

src/avatars.c

@@ -1,262 +0,0 @@
-/*  avatars.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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "avatars.h"
-#include "file_transfers.h"
-#include "friendlist.h"
-#include "misc_tools.h"
-
-extern FriendsList Friends;
-
-static struct Avatar {
-    char name[TOX_MAX_FILENAME_LENGTH + 1];
-    size_t name_len;
-    char path[PATH_MAX + 1];
-    size_t path_len;
-    off_t size;
-} Avatar;
-
-/* Compares the first size bytes of fp to signature.
- *
- * Returns 0 if they are the same
- * Returns 1 if they differ
- * Returns -1 on error.
- *
- * On success this function will seek back to the beginning of fp.
- */
-static int check_file_signature(const unsigned char *signature, size_t size, FILE *fp)
-{
-    char *buf = malloc(size);
-
-    if (buf == NULL) {
-        return -1;
-    }
-
-    if (fread(buf, size, 1, fp) != 1) {
-        free(buf);
-        return -1;
-    }
-
-    int ret = memcmp(signature, buf, size);
-
-    free(buf);
-
-    if (fseek(fp, 0L, SEEK_SET) == -1) {
-        return -1;
-    }
-
-    return ret == 0 ? 0 : 1;
-}
-
-static void avatar_clear(void)
-{
-    Avatar = (struct Avatar) {
-        0
-    };
-}
-
-/* Sends avatar to friendnumber.
- *
- * Returns 0 on success.
- * Returns -1 on failure.
- */
-int avatar_send(Tox *m, uint32_t friendnumber)
-{
-    Tox_Err_File_Send err;
-    uint32_t filenumber = tox_file_send(m, friendnumber, TOX_FILE_KIND_AVATAR, (size_t) Avatar.size,
-                                        NULL, (uint8_t *) Avatar.name, Avatar.name_len, &err);
-
-    if (Avatar.size == 0) {
-        return 0;
-    }
-
-    if (err != TOX_ERR_FILE_SEND_OK) {
-        fprintf(stderr, "tox_file_send failed for friendnumber %u (error %d)\n", friendnumber, err);
-        return -1;
-    }
-
-    struct FileTransfer *ft = new_file_transfer(NULL, friendnumber, filenumber, FILE_TRANSFER_SEND, TOX_FILE_KIND_AVATAR);
-
-    if (!ft) {
-        return -1;
-    }
-
-    ft->file = fopen(Avatar.path, "r");
-
-    if (ft->file == NULL) {
-        return -1;
-    }
-
-    snprintf(ft->file_name, sizeof(ft->file_name), "%s", Avatar.name);
-    ft->file_size = Avatar.size;
-
-    return 0;
-}
-
-/* Sends avatar to all friends */
-static void avatar_send_all(Tox *m)
-{
-    for (size_t i = 0; i < Friends.max_idx; ++i) {
-        if (Friends.list[i].connection_status != TOX_CONNECTION_NONE) {
-            avatar_send(m, Friends.list[i].num);
-        }
-    }
-}
-
-/* Sets avatar to path and sends it to all online contacts.
- *
- * Returns 0 on success.
- * Returns -1 on failure.
- */
-int avatar_set(Tox *m, const char *path, size_t path_len)
-{
-    if (path_len == 0 || path_len >= sizeof(Avatar.path)) {
-        return -1;
-    }
-
-    FILE *fp = fopen(path, "rb");
-
-    if (fp == NULL) {
-        return -1;
-    }
-
-    unsigned char PNG_signature[8] = {0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A};
-
-    if (check_file_signature(PNG_signature, sizeof(PNG_signature), fp) != 0) {
-        fclose(fp);
-        return -1;
-    }
-
-    fclose(fp);
-
-    off_t size = file_size(path);
-
-    if (size == 0 || size > MAX_AVATAR_FILE_SIZE) {
-        return -1;
-    }
-
-    get_file_name(Avatar.name, sizeof(Avatar.name), path);
-    Avatar.name_len = strlen(Avatar.name);
-    snprintf(Avatar.path, sizeof(Avatar.path), "%s", path);
-    Avatar.path_len = path_len;
-    Avatar.size = size;
-
-    avatar_send_all(m);
-
-    return 0;
-}
-
-/* Unsets avatar and sends to all online contacts.
- *
- * Returns 0 on success.
- * Returns -1 on failure.
- */
-void avatar_unset(Tox *m)
-{
-    avatar_clear();
-    avatar_send_all(m);
-}
-
-void on_avatar_friend_connection_status(Tox *m, uint32_t friendnumber, Tox_Connection connection_status)
-{
-    if (connection_status == TOX_CONNECTION_NONE) {
-        kill_avatar_file_transfers_friend(m, friendnumber);
-    }
-}
-
-void on_avatar_file_control(Tox *m, struct FileTransfer *ft, Tox_File_Control control)
-{
-    switch (control) {
-        case TOX_FILE_CONTROL_RESUME:
-            if (ft->state == FILE_TRANSFER_PENDING) {
-                ft->state = FILE_TRANSFER_STARTED;
-            } else if (ft->state == FILE_TRANSFER_PAUSED) {
-                ft->state = FILE_TRANSFER_STARTED;
-            }
-
-            break;
-
-        case TOX_FILE_CONTROL_PAUSE:
-            ft->state = FILE_TRANSFER_PAUSED;
-            break;
-
-        case TOX_FILE_CONTROL_CANCEL:
-            close_file_transfer(NULL, m, ft, -1, NULL, silent);
-            break;
-    }
-}
-
-void on_avatar_chunk_request(Tox *m, struct FileTransfer *ft, uint64_t position, size_t length)
-{
-    if (ft->state != FILE_TRANSFER_STARTED) {
-        return;
-    }
-
-    if (length == 0) {
-        close_file_transfer(NULL, m, ft, -1, NULL, silent);
-        return;
-    }
-
-    if (ft->file == NULL) {
-        close_file_transfer(NULL, m, ft, TOX_FILE_CONTROL_CANCEL, NULL, silent);
-        return;
-    }
-
-    if (ft->position != position) {
-        if (fseek(ft->file, position, SEEK_SET) == -1) {
-            close_file_transfer(NULL, m, ft, TOX_FILE_CONTROL_CANCEL, NULL, silent);
-            return;
-        }
-
-        ft->position = position;
-    }
-
-    uint8_t *send_data = malloc(length);
-
-    if (send_data == NULL) {
-        close_file_transfer(NULL, m, ft, TOX_FILE_CONTROL_CANCEL, NULL, silent);
-        return;
-    }
-
-    size_t send_length = fread(send_data, 1, length, ft->file);
-
-    if (send_length != length) {
-        close_file_transfer(NULL, m, ft, TOX_FILE_CONTROL_CANCEL, NULL, silent);
-        free(send_data);
-        return;
-    }
-
-    Tox_Err_File_Send_Chunk err;
-    tox_file_send_chunk(m, ft->friendnumber, ft->filenumber, position, send_data, send_length, &err);
-
-    free(send_data);
-
-    if (err != TOX_ERR_FILE_SEND_CHUNK_OK) {
-        fprintf(stderr, "tox_file_send_chunk failed in avatar callback (error %d)\n", err);
-    }
-
-    ft->position += send_length;
-}

src/avatars.h

@@ -1,55 +0,0 @@
-/*  avatars.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 AVATARS_H
-#define AVATARS_H
-
-#include "file_transfers.h"
-
-#define MAX_AVATAR_FILE_SIZE 65536
-
-/* Sends avatar to friendnum.
- *
- * Returns 0 on success.
- * Returns -1 on failure.
- */
-int avatar_send(Tox *m, uint32_t friendnum);
-
-/* Sets avatar to path and sends it to all online contacts.
- *
- * Returns 0 on success.
- * Returns -1 on failure.
- */
-int avatar_set(Tox *m, const char *path, size_t length);
-
-/* Unsets avatar and sends to all online contacts.
- *
- * Returns 0 on success.
- * Returns -1 on failure.
- */
-void avatar_unset(Tox *m);
-
-void on_avatar_chunk_request(Tox *m, struct FileTransfer *ft, uint64_t position, size_t length);
-void on_avatar_file_control(Tox *m, struct FileTransfer *ft, Tox_File_Control control);
-void on_avatar_friend_connection_status(Tox *m, uint32_t friendnumber, Tox_Connection connection_status);
-
-#endif /* AVATARS_H */

src/bootstrap.c

@@ -1,634 +0,0 @@
-/*  bootstrap.c
- *
- *
- *  Copyright (C) 2016 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 <arpa/inet.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-
-#include <curl/curl.h>
-#include <tox/tox.h>
-
-#include "configdir.h"
-#include "curl_util.h"
-#include "line_info.h"
-#include "misc_tools.h"
-#include "prompt.h"
-#include "settings.h"
-#include "windows.h"
-
-extern struct user_settings *user_settings;
-
-/* URL that we get the JSON encoded nodes list from. */
-#define NODES_LIST_URL "https://nodes.tox.chat/json"
-
-#define DEFAULT_NODES_FILENAME "DHTnodes.json"
-
-/* Time to wait between bootstrap attempts */
-#define TRY_BOOTSTRAP_INTERVAL 5
-
-/* Number of nodes to bootstrap to per try */
-#define NUM_BOOTSTRAP_NODES 5
-
-/* Number of seconds since last successful ping before we consider a node offline */
-#define NODE_OFFLINE_TIMOUT (60*60*24*2)
-
-#define IP_MAX_SIZE 45
-#define IP_MIN_SIZE 7
-
-#define LAST_SCAN_JSON_KEY "\"last_scan\":"
-#define LAST_SCAN_JSON_KEY_LEN (sizeof(LAST_SCAN_JSON_KEY) - 1)
-
-#define IPV4_JSON_KEY "\"ipv4\":\""
-#define IPV4_JSON_KEY_LEN (sizeof(IPV4_JSON_KEY) - 1)
-
-#define IPV6_JSON_KEY "\"ipv6\":\""
-#define IPV6_JSON_KEY_LEN (sizeof(IPV6_JSON_KEY) - 1)
-
-#define PORT_JSON_KEY "\"port\":"
-#define PORT_JSON_KEY_LEN (sizeof(PORT_JSON_KEY) - 1)
-
-#define PK_JSON_KEY "\"public_key\":\""
-#define PK_JSON_KEY_LEN (sizeof(PK_JSON_KEY) - 1)
-
-#define LAST_PING_JSON_KEY "\"last_ping\":"
-#define LAST_PING_JSON_KEY_LEN (sizeof(LAST_PING_JSON_KEY) - 1)
-
-/* Maximum allowable size of the nodes list */
-#define MAX_NODELIST_SIZE (MAX_RECV_CURL_DATA_SIZE)
-
-static struct Thread_Data {
-    pthread_t tid;
-    pthread_attr_t attr;
-    pthread_mutex_t lock;
-    volatile bool active;
-} thread_data;
-
-#define MAX_NODES 50
-struct Node {
-    char ip4[IP_MAX_SIZE + 1];
-    bool have_ip4;
-
-    char ip6[IP_MAX_SIZE + 1];
-    bool have_ip6;
-
-    char key[TOX_PUBLIC_KEY_SIZE];
-    uint16_t port;
-};
-
-static struct DHT_Nodes {
-    struct Node list[MAX_NODES];
-    size_t count;
-    time_t last_updated;
-} Nodes;
-
-/* Return true if address appears to be a valid ipv4 address. */
-static bool is_ip4_address(const char *address)
-{
-    struct sockaddr_in s_addr;
-    return inet_pton(AF_INET, address, &(s_addr.sin_addr)) != 0;
-}
-
-/* Return true if address roughly appears to be a valid ipv6 address.
- *
- * TODO: Improve this function (inet_pton behaves strangely with ipv6).
- * for now the only guarantee is that it won't return true if the
- * address is a domain or ipv4 address, and should only be used if you're
- * reasonably sure that the address is one of the three (ipv4, ipv6 or a domain).
- */
-static bool is_ip6_address(const char *address)
-{
-    size_t num_colons = 0;
-    char ch = 0;
-
-    for (size_t i = 0; (ch = address[i]); ++i) {
-        if (ch == '.') {
-            return false;
-        }
-
-        if (ch == ':') {
-            ++num_colons;
-        }
-    }
-
-    return num_colons > 1 && num_colons < 8;
-}
-
-/* Determine if a node is offline by comparing the age of the nodeslist
- * to the last time the node was successfully pinged.
- */
-static bool node_is_offline(unsigned long long int last_ping)
-{
-    return last_ping + NODE_OFFLINE_TIMOUT <= last_ping;
-}
-
-/* Return true if nodeslist pointed to by fp needs to be updated.
- * This will be the case if the file is empty, has an invalid format,
- * or if the file is older than the given timeout.
- */
-static bool nodeslist_needs_update(const char *nodes_path)
-{
-    if (user_settings->nodeslist_update_freq <= 0) {
-        return false;
-    }
-
-    FILE *fp = fopen(nodes_path, "r+");
-
-    if (fp == NULL) {
-        return false;
-    }
-
-    /* last_scan value should be at beginning of file */
-    char line[LAST_SCAN_JSON_KEY_LEN + 32];
-
-    if (fgets(line, sizeof(line), fp) == NULL) {
-        fclose(fp);
-        return true;
-    }
-
-    fclose(fp);
-
-    const char *last_scan_val = strstr(line, LAST_SCAN_JSON_KEY);
-
-    if (last_scan_val == NULL) {
-        return true;
-    }
-
-    long long int last_scan = strtoll(last_scan_val + LAST_SCAN_JSON_KEY_LEN, NULL, 10);
-
-    pthread_mutex_lock(&thread_data.lock);
-    Nodes.last_updated = last_scan;
-    pthread_mutex_unlock(&thread_data.lock);
-
-    pthread_mutex_lock(&Winthread.lock);
-    bool is_timeout = timed_out(last_scan, user_settings->nodeslist_update_freq * 24 * 60 * 60);
-    pthread_mutex_unlock(&Winthread.lock);
-
-    if (is_timeout) {
-        return true;
-    }
-
-    return false;
-}
-
-/* Fetches the JSON encoded DHT nodeslist from NODES_LIST_URL.
- *
- * Return 0 on success.
- * Return -1 on failure.
- */
-static int curl_fetch_nodes_JSON(struct Recv_Curl_Data *recv_data)
-{
-    CURL *c_handle = curl_easy_init();
-
-    if (c_handle == NULL) {
-        return -1;
-    }
-
-    int err = -1;
-
-    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, NODES_LIST_URL);
-    curl_easy_setopt(c_handle, CURLOPT_WRITEFUNCTION, curl_cb_write_data);
-    curl_easy_setopt(c_handle, CURLOPT_WRITEDATA, recv_data);
-    curl_easy_setopt(c_handle, CURLOPT_USERAGENT, "libcurl-agent/1.0");
-    curl_easy_setopt(c_handle, CURLOPT_HTTPGET, 1L);
-
-    int proxy_ret = set_curl_proxy(c_handle, arg_opts.proxy_address, arg_opts.proxy_port, arg_opts.proxy_type);
-
-    if (proxy_ret != 0) {
-        fprintf(stderr, "set_curl_proxy() failed with error %d\n", proxy_ret);
-        goto on_exit;
-    }
-
-    int ret = curl_easy_setopt(c_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2);
-
-    if (ret != CURLE_OK) {
-        fprintf(stderr, "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) {
-        fprintf(stderr, "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) {
-            fprintf(stderr, "HTTPS lookup error (libcurl error %d)\n", ret);
-            goto on_exit;
-        }
-    }
-
-    err = 0;
-
-on_exit:
-    curl_slist_free_all(headers);
-    curl_easy_cleanup(c_handle);
-    return err;
-}
-
-/* Attempts to update the DHT nodeslist.
- *
- * Return 1 if list was updated successfully.
- * Return 0 if list does not need to be updated.
- * Return -1 if file cannot be opened.
- * Return -2 if http lookup failed.
- * Return -3 if http reponse was empty.
- * Return -4 if data could not be written to disk.
- * Return -5 if memory allocation fails.
- */
-static int update_DHT_nodeslist(const char *nodes_path)
-{
-    if (!nodeslist_needs_update(nodes_path)) {
-        return 0;
-    }
-
-    FILE *fp = fopen(nodes_path, "r+");
-
-    if (fp == NULL) {
-        return -1;
-    }
-
-    struct Recv_Curl_Data *recv_data = calloc(1, sizeof(struct Recv_Curl_Data));
-
-    if (recv_data == NULL) {
-        fclose(fp);
-        return -5;
-    }
-
-    if (curl_fetch_nodes_JSON(recv_data) == -1) {
-        free(recv_data);
-        fclose(fp);
-        return -2;
-    }
-
-    if (recv_data->length == 0) {
-        free(recv_data);
-        fclose(fp);
-        return -3;
-    }
-
-    if (fwrite(recv_data->data, recv_data->length, 1, fp) != 1) {
-        free(recv_data);
-        fclose(fp);
-        return -4;
-    }
-
-    free(recv_data);
-    fclose(fp);
-
-    return 1;
-}
-
-static void get_nodeslist_path(char *buf, size_t buf_size)
-{
-    char *config_dir = NULL;
-
-    if (arg_opts.nodes_path[0]) {
-        snprintf(buf, buf_size, "%s", arg_opts.nodes_path);
-    } else if ((config_dir = get_user_config_dir()) != NULL) {
-        snprintf(buf, buf_size, "%s%s%s", config_dir, CONFIGDIR, DEFAULT_NODES_FILENAME);
-        free(config_dir);
-    } else {
-        snprintf(buf, buf_size, "%s", DEFAULT_NODES_FILENAME);
-    }
-}
-
-/* Return true if json encoded string s contains a valid IP address and puts address in ip_buf.
- *
- * ip_type should be set to 1 for ipv4 address, or 0 for ipv6 addresses.
- * ip_buf must have room for at least IP_MAX_SIZE + 1 bytes.
- */
-static bool extract_val_ip(const char *s, char *ip_buf, unsigned short int ip_type)
-{
-    int ip_len = char_find(0, s, '"');
-
-    if (ip_len < IP_MIN_SIZE || ip_len > IP_MAX_SIZE) {
-        return false;
-    }
-
-    memcpy(ip_buf, s, ip_len);
-    ip_buf[ip_len] = 0;
-
-    return (ip_type == 1) ? is_ip4_address(ip_buf) : is_ip6_address(ip_buf);
-}
-
-/* Extracts the port from json encoded string s.
- *
- * Return port number on success.
- * Return 0 on failure.
- */
-static uint16_t extract_val_port(const char *s)
-{
-    long int port = strtol(s, NULL, 10);
-    return (port > 0 && port <= MAX_PORT_RANGE) ? port : 0;
-}
-
-/* Extracts the last pinged value from json encoded string s.
- *
- * Return timestamp on success.
- * Return -1 on failure.
- */
-static long long int extract_val_last_pinged(const char *s)
-{
-    long long int last_pinged = strtoll(s, NULL, 10);
-    return (last_pinged <= 0) ? -1 : last_pinged;
-}
-
-/* Extracts DHT public key from json encoded string s and puts key in key_buf.
- * key_buf must have room for at least TOX_PUBLIC_KEY_SIZE * 2 + 1 bytes.
- *
- * Return number of bytes copied to key_buf on success.
- * Return -1 on failure.
- */
-static int extract_val_pk(const char *s, char *key_buf, size_t buf_length)
-{
-    if (buf_length < TOX_PUBLIC_KEY_SIZE * 2 + 1) {
-        return -1;
-    }
-
-    int key_len = char_find(0, s, '"');
-
-    if (key_len != TOX_PUBLIC_KEY_SIZE * 2) {
-        return -1;
-    }
-
-    memcpy(key_buf, s, key_len);
-    key_buf[key_len] = 0;
-
-    return key_len;
-}
-
-/* Extracts values from json formatted string, validats them, and puts them in node.
- *
- * Return 0 on success.
- * Return -1 if line is empty.
- * Return -2 if line does not appear to be a valid nodes list entry.
- * Return -3 if node appears to be offline.
- * Return -4 if entry does not contain either a valid ipv4 or ipv6 address.
- * Return -5 if port value is invalid.
- * Return -6 if public key is invalid.
- */
-static int extract_node(const char *line, struct Node *node)
-{
-    if (!line) {
-        return -1;
-    }
-
-    const char *ip4_start = strstr(line, IPV4_JSON_KEY);
-    const char *ip6_start = strstr(line, IPV6_JSON_KEY);
-    const char *port_start = strstr(line, PORT_JSON_KEY);
-    const char *key_start = strstr(line, PK_JSON_KEY);
-    const char *last_pinged_str = strstr(line, LAST_PING_JSON_KEY);
-
-    if (!ip4_start || !ip6_start || !port_start || !key_start || !last_pinged_str) {
-        return -2;
-    }
-
-    long long int last_pinged = extract_val_last_pinged(last_pinged_str + LAST_PING_JSON_KEY_LEN);
-
-    if (last_pinged <= 0 || node_is_offline(last_pinged)) {
-        return -3;
-    }
-
-    char ip4_string[IP_MAX_SIZE + 1];
-    bool have_ip4 = extract_val_ip(ip4_start + IPV4_JSON_KEY_LEN, ip4_string, 1);
-
-    char ip6_string[IP_MAX_SIZE + 1];
-    bool have_ip6 = extract_val_ip(ip6_start + IPV6_JSON_KEY_LEN, ip6_string, 0);
-
-    if (!have_ip6 && !have_ip4) {
-        return -4;
-    }
-
-    uint16_t port = extract_val_port(port_start + PORT_JSON_KEY_LEN);
-
-    if (port == 0) {
-        return -5;
-    }
-
-    char key_string[TOX_PUBLIC_KEY_SIZE * 2 + 1];
-    int key_len = extract_val_pk(key_start + PK_JSON_KEY_LEN, key_string, sizeof(key_string));
-
-    if (key_len == -1) {
-        return -6;
-    }
-
-    if (tox_pk_string_to_bytes(key_string, key_len, node->key, sizeof(node->key)) == -1) {
-        return -6;
-    }
-
-    if (have_ip4) {
-        snprintf(node->ip4, sizeof(node->ip4), "%s", ip4_string);
-        node->have_ip4 = true;
-    }
-
-    if (have_ip6) {
-        snprintf(node->ip6, sizeof(node->ip6), "%s", ip6_string);
-        node->have_ip6 = true;
-    }
-
-    node->port = port;
-
-    return 0;
-}
-
-/* Loads the DHT nodeslist to memory from json encoded nodes file. */
-void *load_nodeslist_thread(void *data)
-{
-    UNUSED_VAR(data);
-
-    char nodes_path[PATH_MAX];
-    get_nodeslist_path(nodes_path, sizeof(nodes_path));
-
-    FILE *fp = NULL;
-
-    if (!file_exists(nodes_path)) {
-        if ((fp = fopen(nodes_path, "w+")) == NULL) {
-            fprintf(stderr, "nodeslist load error: failed to create file '%s'\n", nodes_path);
-            goto on_exit;
-        }
-    } else if ((fp = fopen(nodes_path, "r+")) == NULL) {
-        fprintf(stderr, "nodeslist load error: failed to open file '%s'\n", nodes_path);
-        goto on_exit;
-    }
-
-    int update_err = update_DHT_nodeslist(nodes_path);
-
-    if (update_err < 0) {
-        fprintf(stderr, "update_DHT_nodeslist() failed with error %d\n", update_err);
-    }
-
-    char line[MAX_NODELIST_SIZE + 1];
-
-    if (fgets(line, sizeof(line), fp) == NULL) {
-        fclose(fp);
-        fprintf(stderr, "nodeslist load error: file empty.\n");
-        goto on_exit;
-    }
-
-    size_t idx = 0;
-    const char *line_start = line;
-
-    while ((line_start = strstr(line_start + 1, IPV4_JSON_KEY))) {
-        pthread_mutex_lock(&thread_data.lock);
-        idx = Nodes.count;
-
-        if (idx >= MAX_NODES) {
-            pthread_mutex_unlock(&thread_data.lock);
-            break;
-        }
-
-        if (extract_node(line_start, &Nodes.list[idx]) == 0) {
-            ++Nodes.count;
-        }
-
-        pthread_mutex_unlock(&thread_data.lock);
-    }
-
-    /* If nodeslist does not contain any valid entries we set the last_scan value
-     * to 0 so that it will fetch a new list the next time this function is called.
-     */
-    if (Nodes.count == 0) {
-        const char *s = "{\"last_scan\":0}";
-        rewind(fp);
-        fwrite(s, strlen(s), 1, fp);  // Not much we can do if it fails
-        fclose(fp);
-        fprintf(stderr, "nodeslist load error: List did not contain any valid entries.\n");
-        goto on_exit;
-    }
-
-    fclose(fp);
-
-on_exit:
-    thread_data.active = false;
-    pthread_attr_destroy(&thread_data.attr);
-    pthread_exit(0);
-}
-
-/* Creates a new thread that will load the DHT nodeslist to memory
- * from json encoded nodes file obtained at NODES_LIST_URL. Only one
- * thread may run at a time.
- *
- * Return 0 on success.
- * Return -1 if a thread is already active.
- * Return -2 if mutex fails to init.
- * Return -3 if pthread attribute fails to init.
- * Return -4 if pthread fails to set detached state.
- * Return -5 if thread creation fails.
- */
-int load_DHT_nodeslist(void)
-{
-    if (thread_data.active) {
-        return -1;
-    }
-
-    if (pthread_mutex_init(&thread_data.lock, NULL) != 0) {
-        return -2;
-    }
-
-    if (pthread_attr_init(&thread_data.attr) != 0) {
-        return -3;
-    }
-
-    if (pthread_attr_setdetachstate(&thread_data.attr, PTHREAD_CREATE_DETACHED) != 0) {
-        return -4;
-    }
-
-    thread_data.active = true;
-
-    if (pthread_create(&thread_data.tid, &thread_data.attr, load_nodeslist_thread, NULL) != 0) {
-        thread_data.active = false;
-        return -5;
-    }
-
-    return 0;
-}
-
-/* Connects to NUM_BOOTSTRAP_NODES random DHT nodes listed in the DHTnodes file. */
-static void DHT_bootstrap(Tox *m)
-{
-    pthread_mutex_lock(&thread_data.lock);
-    size_t num_nodes = Nodes.count;
-    pthread_mutex_unlock(&thread_data.lock);
-
-    if (num_nodes == 0) {
-        return;
-    }
-
-    size_t i;
-
-    pthread_mutex_lock(&thread_data.lock);
-
-    for (i = 0; i < NUM_BOOTSTRAP_NODES; ++i) {
-        struct Node *node = &Nodes.list[rand() % Nodes.count];
-        const char *addr = node->have_ip4 ? node->ip4 : node->ip6;
-
-        if (!addr) {
-            continue;
-        }
-
-        Tox_Err_Bootstrap err;
-        tox_bootstrap(m, addr, node->port, (uint8_t *) node->key, &err);
-
-        if (err != TOX_ERR_BOOTSTRAP_OK) {
-            fprintf(stderr, "Failed to bootstrap %s:%d\n", addr, node->port);
-        }
-
-        tox_add_tcp_relay(m, addr, node->port, (uint8_t *) node->key, &err);
-
-        if (err != TOX_ERR_BOOTSTRAP_OK) {
-            fprintf(stderr, "Failed to add TCP relay %s:%d\n", addr, node->port);
-        }
-    }
-
-    pthread_mutex_unlock(&thread_data.lock);
-}
-
-/* Manages connection to the Tox DHT network. */
-void do_tox_connection(Tox *m)
-{
-    static time_t last_bootstrap_time = 0;
-    bool connected = prompt_selfConnectionStatus() != TOX_CONNECTION_NONE;
-
-    if (!connected && timed_out(last_bootstrap_time, TRY_BOOTSTRAP_INTERVAL)) {
-        DHT_bootstrap(m);
-        last_bootstrap_time = get_unix_time();
-    }
-}

src/bootstrap.h

@@ -1,42 +0,0 @@
-/*  bootstrap.h
- *
- *
- *  Copyright (C) 2016 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 BOOTSTRAP_H
-#define BOOTSTRAP_H
-
-/* Manages connection to the Tox DHT network. */
-void do_tox_connection(Tox *m);
-
-/* Creates a new thread that will load the DHT nodeslist to memory
- * from json encoded nodes file obtained at NODES_LIST_URL. Only one
- * thread may run at a time.
- *
- * Return 0 on success.
- * Return -1 if a thread is already active.
- * Return -2 if mutex fails to init.
- * Return -3 if pthread attribute fails to init.
- * Return -4 if pthread fails to set detached state.
- * Return -5 if thread creation fails.
- */
-int load_DHT_nodeslist(void);
-
-#endif /* BOOTSTRAP_H */

src/chat.h

@@ -20,16 +20,13 @@
  *
  */
 
-#ifndef CHAT_H
-#define CHAT_H
+#ifndef CHAT_H_6489PZ13
+#define CHAT_H_6489PZ13
 
-#include "toxic.h"
 #include "windows.h"
+#include "toxic.h"
 
-/* set CTRL to -1 if we don't want to send a control signal.
-   set msg to NULL if we don't want to display a message */
-void chat_close_file_receiver(Tox *m, int filenum, int friendnum, int CTRL);
-void kill_chat_window(ToxWindow *self, Tox *m);
-ToxWindow *new_chat(Tox *m, int32_t friendnum);
+void kill_chat_window(ToxWindow *self);
+ToxWindow new_chat(Tox *m, int32_t friendnum);
 
-#endif /* end of include guard: CHAT_H */
+#endif /* end of include guard: CHAT_H_6489PZ13 */

src/chat_commands.c

@@ -20,487 +20,265 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "chat.h"
-#include "conference.h"
-#include "execute.h"
-#include "file_transfers.h"
-#include "friendlist.h"
-#include "line_info.h"
-#include "groupchats.h"
-#include "misc_tools.h"
 #include "toxic.h"
 #include "windows.h"
+#include "misc_tools.h"
+#include "friendlist.h"
+#include "execute.h"
+#include "line_info.h"
 
 extern ToxWindow *prompt;
-extern FriendsList Friends;
 
-void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+extern ToxicFriend friends[MAX_FRIENDS_NUM];
+
+extern FileSender file_senders[MAX_FILES];
+extern uint8_t max_file_senders_index;
+
+void cmd_chat_help(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
-    UNUSED_VAR(window);
+    struct history *hst = self->chatwin->hst;
+    line_info_clear(hst);
+    struct line_info *start = hst->line_start;
 
-    if (argc < 2) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Requires type in|out and the file ID.");
-        return;
-    }
-
-    char msg[MAX_STR_SIZE];
-    const char *inoutstr = argv[1];
-    long int idx = strtol(argv[2], NULL, 10);
-
-    if ((idx == 0 && strcmp(argv[2], "0")) || idx >= MAX_FILES || idx < 0) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
-        return;
-    }
-
-    // first check transfer queue
-    if (file_send_queue_remove(self->num, idx) == 0) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Pending file transfer removed from queue");
-        return;
-    }
-
-    FileTransfer *ft = NULL;
-
-    /* cancel an incoming file transfer */
-    if (strcasecmp(inoutstr, "in") == 0) {
-        ft = get_file_transfer_struct_index(self->num, idx, FILE_TRANSFER_RECV);
-    } else if (strcasecmp(inoutstr, "out") == 0) {
-        ft = get_file_transfer_struct_index(self->num, idx, FILE_TRANSFER_SEND);
-    } else {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Type must be 'in' or 'out'.");
-        return;
-    }
-
-    if (!ft) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
-        return;
-    }
-
-    if (ft->state == FILE_TRANSFER_INACTIVE) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid file ID.");
-        return;
-    }
-
-    snprintf(msg, sizeof(msg), "File transfer for '%s' aborted.", ft->file_name);
-    close_file_transfer(self, m, ft, TOX_FILE_CONTROL_CANCEL, msg, silent);
-}
-
-void cmd_conference_invite(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    UNUSED_VAR(window);
-
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Conference number required.");
-        return;
-    }
-
-    long int conferencenum = strtol(argv[1], NULL, 10);
-
-    if ((conferencenum == 0 && strcmp(argv[1], "0")) || conferencenum < 0 || conferencenum == LONG_MAX) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid conference number.");
-        return;
-    }
-
-    Tox_Err_Conference_Invite err;
-
-    if (!tox_conference_invite(m, self->num, conferencenum, &err)) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to invite contact to conference (error %d)", err);
-        return;
-    }
-
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invited contact to Conference %ld.", conferencenum);
-}
-
-void cmd_conference_join(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    UNUSED_VAR(window);
-    UNUSED_VAR(argc);
-    UNUSED_VAR(argv);
-
-    if (get_num_active_windows() >= MAX_WINDOWS_NUM) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, RED, " * Warning: Too many windows are open.");
-        return;
-    }
-
-    const char *conferencekey = Friends.list[self->num].conference_invite.key;
-    uint16_t length = Friends.list[self->num].conference_invite.length;
-    uint8_t type = Friends.list[self->num].conference_invite.type;
-
-    if (!Friends.list[self->num].conference_invite.pending) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending conference invite.");
-        return;
-    }
-
-    uint32_t conferencenum;
-
-    if (type == TOX_CONFERENCE_TYPE_TEXT) {
-        Tox_Err_Conference_Join err;
-        conferencenum = tox_conference_join(m, self->num, (const uint8_t *) conferencekey, length, &err);
-
-        if (err != TOX_ERR_CONFERENCE_JOIN_OK) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Conference instance failed to initialize (error %d)", err);
+    if (argc == 1) {
+        if (!strcmp(argv[1], "global")) {
+            execute(window, self, m, "/help", GLOBAL_COMMAND_MODE);
             return;
         }
-    } else if (type == TOX_CONFERENCE_TYPE_AV) {
-#ifdef AUDIO
-        conferencenum = toxav_join_av_groupchat(m, self->num, (const uint8_t *) conferencekey, length,
-                                                audio_conference_callback, NULL);
+    }
 
-        if (conferencenum == (uint32_t) -1) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Audio conference instance failed to initialize");
-            return;
-        }
+    uint8_t *msg = "Chat commands:";
+    line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 1, CYAN);
 
+#ifdef _SUPPORT_AUDIO
+#define NUMLINES 13
 #else
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Audio support disabled by compile-time option.");
-        return;
+#define NUMLINES 9
 #endif
-    } else {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Unknown conference type %d", type);
-        return;
-    }
 
-    if (init_conference_win(m, conferencenum, type, NULL, 0) == -1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Conference window failed to initialize.");
-        tox_conference_delete(m, conferencenum, NULL);
-        return;
-    }
+    uint8_t lines[NUMLINES][MAX_STR_SIZE] = {
 
-#ifdef AUDIO
+#ifdef _SUPPORT_AUDIO
+        { "    /call                      : Audio call"                           },
+        { "    /cancel                    : Cancel call"                          },
+        { "    /answer                    : Answer incomming call"                },
+        { "    /reject                    : Reject incoming call"                 },
+        { "    /hangup                    : Hangup active call"                   },
+#endif /* _SUPPORT_AUDIO */
+        { "    /invite <n>                : Invite friend to a group chat"        },
+        { "    /join                      : Join a pending group chat"            },
+        { "    /log <on> or <off>         : Enable/disable logging"               },
+        { "    /sendfile <filepath>       : Send a file"                          },
+        { "    /savefile <n>              : Receive a file"                       },
+        { "    /close                     : Close the current chat window"        },
+        { "    /help                      : Print this message again"             },
+        { "    /help global               : Show a list of global commands"       },
+    };
 
-    if (type == TOX_CONFERENCE_TYPE_AV) {
-        if (!init_conference_audio_input(m, conferencenum)) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Audio capture failed; use \"/audio on\" to try again.");
-        }
-    }
+    int i;
 
-#endif
+    for (i = 0; i < NUMLINES; ++i)
+        line_info_add(self, NULL, NULL, NULL, lines[i], SYS_MSG, 0, 0);
+
+    msg = " * Use Page Up/Page Down to scroll chat history\n";
+    line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 1, CYAN);
+
+    hst->line_start = start;
 }
 
-void cmd_group_accept(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+void cmd_groupinvite(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
-    if (get_num_active_windows() >= MAX_WINDOWS_NUM) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, RED, " * Warning: Too many windows are open.");
-        return;
-    }
+    uint8_t *errmsg;
 
-    if (Friends.list[self->num].group_invite.length == 0) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending group invite");
-        return;
-    }
-
-    const char *passwd = NULL;
-    uint16_t passwd_len = 0;
-
-    if (argc > 0) {
-        passwd = argv[1];
-        passwd_len = strlen(passwd);
-    }
-
-    size_t nick_len = tox_self_get_name_size(m);
-    char self_nick[TOX_MAX_NAME_LENGTH + 1];
-    tox_self_get_name(m, (uint8_t *) self_nick);
-    self_nick[nick_len] = '\0';
-
-    Tox_Err_Group_Invite_Accept err;
-    uint32_t groupnumber = tox_group_invite_accept(m, self->num, Friends.list[self->num].group_invite.data,
-                           Friends.list[self->num].group_invite.length, (const uint8_t *) self_nick, nick_len,
-                           (const uint8_t *) passwd, passwd_len, &err);
-
-    if (err != TOX_ERR_GROUP_INVITE_ACCEPT_OK) {
-        if (err == TOX_ERR_GROUP_INVITE_ACCEPT_TOO_LONG) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to join group: Password too long.");
-        } else {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to join group (error %d).", err);
-        }
-
-        return;
-    }
-
-    if (init_groupchat_win(m, groupnumber, NULL, 0, Group_Join_Type_Join) == -1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Group chat window failed to initialize.");
-        tox_group_leave(m, groupnumber, NULL, 0, NULL);
-        return;
-    }
-}
-
-void cmd_group_invite(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
     if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Group number required.");
+        errmsg = "Invalid syntax";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
         return;
     }
 
-    int groupnumber = atoi(argv[1]);
+    int groupnum = atoi(argv[1]);
 
-    if (groupnumber == 0 && strcmp(argv[1], "0")) {    /* atoi returns 0 value on invalid input */
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid group number.");
+    if (groupnum == 0 && strcmp(argv[1], "0")) {    /* atoi returns 0 value on invalid input */
+        errmsg = "Invalid syntax.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
         return;
     }
 
-    Tox_Err_Group_Invite_Friend err;
-
-    if (!tox_group_invite_friend(m, groupnumber, self->num, &err)) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to invite contact to group (error %d).", err);
+    if (tox_invite_friend(m, self->num, groupnum) == -1) {
+        errmsg = "Failed to invite friend.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
         return;
     }
 
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invited contact to Group %d.", groupnumber);
+    uint8_t msg[MAX_STR_SIZE];
+    snprintf(msg, sizeof(msg), "Invited friend to Room #%d.", groupnum);
+    line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
 }
 
-#ifdef GAMES
-
-void cmd_game_join(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+void cmd_join_group(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
-    UNUSED_VAR(window);
-    UNUSED_VAR(m);
-
-    if (!Friends.list[self->num].game_invite.pending) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending game invite.");
-        return;
-    }
+    uint8_t *errmsg;
 
     if (get_num_active_windows() >= MAX_WINDOWS_NUM) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, RED, " * Warning: Too many windows are open.");
+        errmsg = " * Warning: Too many windows are open.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, RED);
         return;
     }
 
-    GameType type = Friends.list[self->num].game_invite.type;
-    uint32_t id = Friends.list[self->num].game_invite.id;
-    uint8_t *data = Friends.list[self->num].game_invite.data;
-    size_t length = Friends.list[self->num].game_invite.data_length;
+    uint8_t *groupkey = friends[self->num].pending_groupchat;
 
-    int ret = game_initialize(self, m, type, id, data, length);
+    if (groupkey[0] == '\0') {
+        errmsg = "No pending group chat invite.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
+        return;
+    }
 
-    switch (ret) {
-        case 0: {
-            free(data);
-            Friends.list[self->num].game_invite.data = NULL;
-            Friends.list[self->num].game_invite.pending = false;
-            break;
-        }
+    int groupnum = tox_join_groupchat(m, self->num, groupkey);
 
-        case -1: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Window is too small. Try enlarging your window.");
-            return;
-        }
+    if (groupnum == -1) {
+        errmsg = "Group chat instance failed to initialize.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
+        return;
+    }
 
-        case -2: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Game failed to initialize (network error)");
-            return;
-        }
-
-        default: {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Game failed to initialize (error %d)", ret);
-            return;
-        }
+    if (init_groupchat_win(prompt, m, groupnum) == -1) {
+        errmsg = "Group chat window failed to initialize.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
+        tox_del_groupchat(m, groupnum);
+        return;
     }
 }
 
-#endif // GAMES
-
 void cmd_savefile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
-    UNUSED_VAR(window);
+    uint8_t *errmsg;
 
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File ID required.");
+    if (argc != 1) {
+        errmsg = "Invalid syntax.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
         return;
     }
 
-    long int idx = strtol(argv[1], NULL, 10);
+    uint8_t filenum = atoi(argv[1]);
 
-    if ((idx == 0 && strcmp(argv[1], "0")) || idx < 0 || idx >= MAX_FILES) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
+    if ((filenum == 0 && strcmp(argv[1], "0")) || filenum >= MAX_FILES) {
+        errmsg = "No pending file transfers with that number.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
         return;
     }
 
-    FileTransfer *ft = get_file_transfer_struct_index(self->num, idx, FILE_TRANSFER_RECV);
-
-    if (!ft) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
+    if (!friends[self->num].file_receiver.pending[filenum]) {
+        errmsg = "No pending file transfers with that number.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
         return;
     }
 
-    if (ft->state != FILE_TRANSFER_PENDING) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
-        return;
+    uint8_t *filename = friends[self->num].file_receiver.filenames[filenum];
+
+    if (tox_file_send_control(m, self->num, 1, filenum, TOX_FILECONTROL_ACCEPT, 0, 0) == 0) {
+        uint8_t msg[MAX_STR_SIZE];
+        snprintf(msg, sizeof(msg), "Saving file as: '%s' (%.1f%%)", filename, 0.0);
+        line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
+        friends[self->num].file_receiver.line_id[filenum] = self->chatwin->hst->line_end->id + 1;
+
+        if ((friends[self->num].file_receiver.files[filenum] = fopen(filename, "a")) == NULL) {
+            errmsg = "* Error writing to file.";
+            line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, RED);
+            tox_file_send_control(m, self->num, 1, filenum, TOX_FILECONTROL_KILL, 0, 0);
+        }
+    } else {
+        errmsg = "File transfer failed.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
     }
 
-    if ((ft->file = fopen(ft->file_path, "a")) == NULL) {
-        const char *msg =  "File transfer failed: Invalid download path.";
-        close_file_transfer(self, m, ft, TOX_FILE_CONTROL_CANCEL, msg, notif_error);
-        return;
-    }
-
-    Tox_Err_File_Control err;
-    tox_file_control(m, self->num, ft->filenumber, TOX_FILE_CONTROL_RESUME, &err);
-
-    if (err != TOX_ERR_FILE_CONTROL_OK) {
-        goto on_recv_error;
-    }
-
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Saving file [%ld] as: '%s'", idx, ft->file_path);
-
-    /* prep progress bar line */
-    char progline[MAX_STR_SIZE];
-    init_progress_bar(progline);
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", progline);
-
-    ft->line_id = self->chatwin->hst->line_end->id + 2;
-    ft->state = FILE_TRANSFER_STARTED;
-
-    return;
-
-on_recv_error:
-
-    switch (err) {
-        case TOX_ERR_FILE_CONTROL_FRIEND_NOT_FOUND:
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: Friend not found.");
-            return;
-
-        case TOX_ERR_FILE_CONTROL_FRIEND_NOT_CONNECTED:
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: Friend is not online.");
-            return;
-
-        case TOX_ERR_FILE_CONTROL_NOT_FOUND:
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: Invalid filenumber.");
-            return;
-
-        case TOX_ERR_FILE_CONTROL_SENDQ:
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: Connection error.");
-            return;
-
-        default:
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed (error %d)\n", err);
-            return;
-    }
+    friends[self->num].file_receiver.pending[filenum] = false;
 }
 
 void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
-    UNUSED_VAR(window);
+    uint8_t *errmsg;
 
-    const char *errmsg = NULL;
-
-    if (argc < 1) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File path required.");
+    if (max_file_senders_index >= (MAX_FILES - 1)) {
+        errmsg = "Please wait for some of your outgoing file transfers to complete.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
         return;
     }
 
-    char path[MAX_STR_SIZE];
-    snprintf(path, sizeof(path), "%s", argv[1]);
+    if (argc < 1) {
+        errmsg = "Invalid syntax.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
+        return;
+    }
+
+    uint8_t *path = argv[1];
+
+    if (path[0] != '\"') {
+        errmsg = "File path must be enclosed in quotes.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
+        return;
+    }
+
+    path[strlen(++path) - 1] = L'\0';
     int path_len = strlen(path);
 
-    if (path_len >= MAX_STR_SIZE) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File path exceeds character limit.");
+    if (path_len > MAX_STR_SIZE) {
+        errmsg = "File path exceeds character limit.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
         return;
     }
 
     FILE *file_to_send = fopen(path, "r");
 
     if (file_to_send == NULL) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File `%s` not found.", path);
+        errmsg = "File not found.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
         return;
     }
 
-    off_t filesize = file_size(path);
+    fseek(file_to_send, 0, SEEK_END);
+    uint64_t filesize = ftell(file_to_send);
+    fseek(file_to_send, 0, SEEK_SET);
 
-    if (filesize == 0) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid file.");
-        fclose(file_to_send);
+    uint8_t filename[MAX_STR_SIZE];
+    get_file_name(filename, path);
+    int filenum = tox_new_file_sender(m, self->num, filesize, filename, strlen(filename));
+
+    if (filenum == -1) {
+        errmsg = "Error sending file.";
+        line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
         return;
     }
 
-    char file_name[TOX_MAX_FILENAME_LENGTH];
-    size_t namelen = get_file_name(file_name, sizeof(file_name), path);
+    int i;
 
-    Tox_Err_File_Send err;
-    uint32_t filenum = tox_file_send(m, self->num, TOX_FILE_KIND_DATA, (uint64_t) filesize, NULL,
-                                     (uint8_t *) file_name, namelen, &err);
+    for (i = 0; i < MAX_FILES; ++i) {
+        if (!file_senders[i].active) {
+            memcpy(file_senders[i].pathname, path, path_len + 1);
+            file_senders[i].active = true;
+            file_senders[i].toxwin = self;
+            file_senders[i].file = file_to_send;
+            file_senders[i].filenum = filenum;
+            file_senders[i].friendnum = self->num;
+            file_senders[i].timestamp = get_unix_time();
+            file_senders[i].size = filesize;
+            file_senders[i].piecelen = fread(file_senders[i].nextpiece, 1,
+                                             tox_file_data_size(m, self->num), file_to_send);
 
-    if (err != TOX_ERR_FILE_SEND_OK) {
-        goto on_send_error;
-    }
+            uint8_t msg[MAX_STR_SIZE];
+            snprintf(msg, sizeof(msg), "Sending file: '%s'", path);
+            line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
 
-    FileTransfer *ft = new_file_transfer(self, self->num, filenum, FILE_TRANSFER_SEND, TOX_FILE_KIND_DATA);
-
-    if (!ft) {
-        err = TOX_ERR_FILE_SEND_TOO_MANY;
-        goto on_send_error;
-    }
-
-    memcpy(ft->file_name, file_name, namelen + 1);
-    ft->file = file_to_send;
-    ft->file_size = filesize;
-    tox_file_get_file_id(m, self->num, filenum, ft->file_id, NULL);
-
-    char sizestr[32];
-    bytes_convert_str(sizestr, sizeof(sizestr), filesize);
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Sending file [%d]: '%s' (%s)", filenum, file_name, sizestr);
-
-    return;
-
-on_send_error:
-
-    fclose(file_to_send);
-
-    switch (err) {
-        case TOX_ERR_FILE_SEND_FRIEND_NOT_FOUND: {
-            errmsg = "File transfer failed: Invalid friend.";
-            break;
-        }
-
-        case TOX_ERR_FILE_SEND_FRIEND_NOT_CONNECTED: {
-            int queue_idx = file_send_queue_add(self->num, path, path_len);
-
-            char msg[MAX_STR_SIZE];
-
-            switch (queue_idx) {
-                case -1: {
-                    snprintf(msg, sizeof(msg), "Invalid file name: path is null or length is zero.");
-                    break;
-                }
-
-                case -2: {
-                    snprintf(msg, sizeof(msg), "File name is too long.");
-                    break;
-                }
-
-                case -3: {
-                    snprintf(msg, sizeof(msg), "File send queue is full.");
-                    break;
-                }
-
-                default: {
-                    snprintf(msg, sizeof(msg), "File transfer queued. Type \"/cancel out %d\" to cancel.", queue_idx);
-                    break;
-                }
-            }
-
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", msg);
+            if (i == max_file_senders_index)
+                ++max_file_senders_index;
 
             return;
         }
-
-        case TOX_ERR_FILE_SEND_NAME_TOO_LONG: {
-            errmsg = "File transfer failed: Filename is too long.";
-            break;
-        }
-
-        case TOX_ERR_FILE_SEND_TOO_MANY: {
-            errmsg = "File transfer failed: Too many concurrent file transfers.";
-            break;
-        }
-
-        default: {
-            errmsg = "File transfer failed.";
-            break;
-        }
     }
-
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", errmsg);
-    tox_file_control(m, self->num, filenum, TOX_FILE_CONTROL_CANCEL, NULL);
 }

src/chat_commands.h

@@ -20,37 +20,25 @@
  *
  */
 
-#ifndef CHAT_COMMANDS_H
-#define CHAT_COMMANDS_H
+#ifndef _chat_commands_h
+#define _chat_commands_h
 
-#include "toxic.h"
 #include "windows.h"
+#include "toxic.h"
 
-void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_conference_invite(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_conference_join(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_group_accept(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_group_invite(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_game_join(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_chat_help(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_groupinvite(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_join_group(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_savefile(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_sendfile(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 
-#ifdef AUDIO
+
+#ifdef _SUPPORT_AUDIO
 void cmd_call(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_answer(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_reject(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_hangup(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_cancel(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_ccur_device(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-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]);
-void cmd_bitrate(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-#endif /* AUDIO */
+#endif /* _SUPPORT_AUDIO */
 
-#ifdef VIDEO
-void cmd_vcall(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_video(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_res(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
-#endif /* VIDEO */
-
-#endif /* CHAT_COMMANDS_H */
+#endif /* #define _chat_commands_h */

src/conference.h

@@ -1,118 +0,0 @@
-/*  conference.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 CONFERENCE_H
-#define CONFERENCE_H
-
-#include "toxic.h"
-#include "windows.h"
-
-#define CONFERENCE_MAX_TITLE_LENGTH TOX_MAX_NAME_LENGTH
-#define SIDEBAR_WIDTH 16
-
-typedef struct ConferencePeer {
-    bool       active;
-
-    uint8_t    pubkey[TOX_PUBLIC_KEY_SIZE];
-    uint32_t   peernum;    /* index in chat->peer_list */
-
-    char       name[TOX_MAX_NAME_LENGTH];
-    size_t     name_length;
-
-    bool       sending_audio;
-    uint32_t   audio_out_idx;
-    time_t     last_audio_time;
-} ConferencePeer;
-
-typedef struct AudioInputCallbackData {
-    Tox *tox;
-    uint32_t conferencenum;
-} AudioInputCallbackData;
-
-#define PUBKEY_STRING_SIZE (2 * TOX_PUBLIC_KEY_SIZE + 1)
-typedef struct NameListEntry {
-    char name[TOX_MAX_NAME_LENGTH];
-    char pubkey_str[PUBKEY_STRING_SIZE];
-    uint32_t peernum;
-} NameListEntry;
-
-
-typedef struct {
-    int chatwin;
-    bool active;
-    uint8_t type;
-    int side_pos;    /* current position of the sidebar - used for scrolling up and down */
-    time_t start_time;
-
-    char title[CONFERENCE_MAX_TITLE_LENGTH + 1];
-    size_t title_length;
-
-    ConferencePeer *peer_list;
-    uint32_t max_idx;
-
-    NameListEntry *name_list;
-    uint32_t num_peers;
-
-    bool push_to_talk_enabled;
-    time_t ptt_last_pushed;
-
-    bool audio_enabled;
-    time_t last_sent_audio;
-    uint32_t audio_in_idx;
-    AudioInputCallbackData audio_input_callback_data;
-} ConferenceChat;
-
-/* Frees all Toxic associated data structures for a conference (does not call tox_conference_delete() ) */
-void free_conference(ToxWindow *self, uint32_t conferencenum);
-
-int init_conference_win(Tox *m, uint32_t conferencenum, uint8_t type, const char *title, size_t length);
-
-/* destroys and re-creates conference window with or without the peerlist */
-void redraw_conference_win(ToxWindow *self);
-
-void conference_set_title(ToxWindow *self, uint32_t conferencesnum, const char *title, size_t length);
-void conference_rename_log_path(Tox *m, uint32_t conferencenum, const char *new_title);
-int conference_enable_logging(ToxWindow *self, Tox *m, uint32_t conferencenum, struct chatlog *log);
-
-/* Puts `(NameListEntry *)`s in `entries` for each matched peer, up to a maximum
- * of `maxpeers`.
- * Maches each peer whose name or pubkey begins with `prefix`.
- * If `prefix` is exactly the pubkey of a peer, matches only that peer.
- * return number of entries placed in `entries`.
- */
-uint32_t get_name_list_entries_by_prefix(uint32_t conferencenum, const char *prefix, NameListEntry **entries,
-        uint32_t maxpeers);
-
-bool init_conference_audio_input(Tox *tox, uint32_t conferencenum);
-bool enable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum);
-bool disable_conference_audio(ToxWindow *self, Tox *tox, uint32_t conferencenum);
-bool toggle_conference_push_to_talk(uint32_t conferencenum, bool enabled);
-void audio_conference_callback(void *tox, uint32_t conferencenum, uint32_t peernum,
-                               const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t
-                               sample_rate, void *userdata);
-
-bool conference_mute_self(uint32_t conferencenum);
-bool conference_mute_peer(const Tox *m, uint32_t conferencenum, uint32_t peernum);
-bool conference_set_VAD_threshold(uint32_t conferencenum, float threshold);
-float conference_get_VAD_threshold(uint32_t conferencenum);
-
-#endif /* CONFERENCE_H */

src/conference_commands.c

@@ -1,210 +0,0 @@
-/*  conference_commands.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 "conference.h"
-#include "line_info.h"
-#include "log.h"
-#include "misc_tools.h"
-#include "toxic.h"
-#include "windows.h"
-
-static void print_err(ToxWindow *self, const char *error_str)
-{
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", error_str);
-}
-
-void cmd_conference_set_title(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    UNUSED_VAR(window);
-
-    Tox_Err_Conference_Title err;
-    char title[CONFERENCE_MAX_TITLE_LENGTH + 1];
-
-    if (argc < 1) {
-        size_t tlen = tox_conference_get_title_size(m, self->num, &err);
-
-        if (err != TOX_ERR_CONFERENCE_TITLE_OK || tlen >= sizeof(title)) {
-            print_err(self, "Title is not set");
-            return;
-        }
-
-        if (!tox_conference_get_title(m, self->num, (uint8_t *) title, &err)) {
-            print_err(self, "Title is not set");
-            return;
-        }
-
-        title[tlen] = '\0';
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Title is set to: %s", title);
-
-        return;
-    }
-
-    size_t len = strlen(argv[1]);
-
-    if (len >= sizeof(title)) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to set title: max length exceeded.");
-        return;
-    }
-
-    snprintf(title, sizeof(title), "%s", argv[1]);
-
-    if (!tox_conference_set_title(m, self->num, (uint8_t *) title, len, &err)) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Failed to set title (error %d)", err);
-        return;
-    }
-
-    conference_rename_log_path(m, self->num, title);  // must be called first
-
-    conference_set_title(self, self->num, title, len);
-
-    char selfnick[TOX_MAX_NAME_LENGTH];
-    tox_self_get_name(m, (uint8_t *) selfnick);
-
-    size_t sn_len = tox_self_get_name_size(m);
-    selfnick[sn_len] = '\0';
-
-    line_info_add(self, true, selfnick, NULL, NAME_CHANGE, 0, 0, " set the conference title to: %s", title);
-
-    char tmp_event[MAX_STR_SIZE + 20];
-    snprintf(tmp_event, sizeof(tmp_event), "set title to %s", title);
-    write_to_log(tmp_event, selfnick, self->chatwin->log, true);
-}
-
-#ifdef AUDIO
-void cmd_enable_audio(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    UNUSED_VAR(window);
-
-    bool enable;
-
-    if (argc == 1 && !strcasecmp(argv[1], "on")) {
-        enable = true;
-    } else if (argc == 1 && !strcasecmp(argv[1], "off")) {
-        enable = false;
-    } else {
-        print_err(self, "Please specify: on | off");
-        return;
-    }
-
-    if (enable ? enable_conference_audio(self, m, self->num) : disable_conference_audio(self, m, self->num)) {
-        print_err(self, enable ? "Enabled conference audio. Use the '/ptt' command to toggle Push-To-Talk."
-                  : "Disabled conference audio");
-    } else {
-        print_err(self, enable ? "Failed to enable audio" : "Failed to disable audio");
-    }
-}
-
-void cmd_conference_mute(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    UNUSED_VAR(window);
-
-    if (argc < 1) {
-        if (conference_mute_self(self->num)) {
-            print_err(self, "Toggled self audio mute status");
-        } else {
-            print_err(self, "No audio input to mute");
-        }
-    } else {
-        NameListEntry *entries[16];
-        uint32_t n = get_name_list_entries_by_prefix(self->num, argv[1], entries, 16);
-
-        if (n == 0) {
-            print_err(self, "No such peer");
-            return;
-        }
-
-        if (n > 1) {
-            print_err(self, "Multiple matching peers (use /mute [public key] to disambiguate):");
-
-            for (uint32_t i = 0; i < n; ++i) {
-                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s: %s", entries[i]->pubkey_str, entries[i]->name);
-            }
-
-            return;
-        }
-
-        if (conference_mute_peer(m, self->num, entries[0]->peernum)) {
-            line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Toggled audio mute status of %s", entries[0]->name);
-        } else {
-            print_err(self, "Peer is not on the call");
-        }
-    }
-}
-
-void cmd_conference_sense(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    UNUSED_VAR(window);
-    UNUSED_VAR(m);
-
-    if (argc == 0) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Current VAD threshold: %.1f",
-                      (double) conference_get_VAD_threshold(self->num));
-        return;
-    }
-
-    if (argc > 1) {
-        print_err(self, "Only one argument allowed.");
-        return;
-    }
-
-    char *end;
-    float value = strtof(argv[1], &end);
-
-    if (*end) {
-        print_err(self, "Invalid input");
-        return;
-    }
-
-    if (conference_set_VAD_threshold(self->num, value)) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Set VAD threshold to %.1f", (double) value);
-    } else {
-        print_err(self, "Failed to set conference audio input sensitivity.");
-    }
-}
-
-void cmd_conference_push_to_talk(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
-{
-    UNUSED_VAR(window);
-    UNUSED_VAR(m);
-
-    bool enable;
-
-    if (argc == 1 && !strcasecmp(argv[1], "on")) {
-        enable = true;
-    } else if (argc == 1 && !strcasecmp(argv[1], "off")) {
-        enable = false;
-    } else {
-        print_err(self, "Please specify: on | off");
-        return;
-    }
-
-    if (!toggle_conference_push_to_talk(self->num, enable)) {
-        print_err(self, "Failed to toggle push to talk.");
-        return;
-    }
-
-    print_err(self, enable ? "Push-To-Talk is enabled. Push F2 to activate" : "Push-To-Talk is disabled");
-}
-#endif /* AUDIO */

src/conference_commands.h

@@ -1,36 +0,0 @@
-/*  conference_commands.h
- *
- *
- *  Copyright (C) 2020 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 CONFERENCE_COMMANDS_H
-#define CONFERENCE_COMMANDS_H
-
-#include "toxic.h"
-#include "windows.h"
-
-void cmd_conference_set_title(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_enable_audio(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_conference_mute(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_conference_sense(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-void cmd_conference_push_to_talk(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
-
-#endif /* CONFERENCE_COMMANDS_H */
-

src/configdir.c

@@ -20,59 +20,58 @@
  *
  */
 
-#include <errno.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
-#include <sys/stat.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
 #include <unistd.h>
+#include <pwd.h>
 
 #include "configdir.h"
-#include "misc_tools.h"
-#include "toxic.h"
-
-/* get the user's home directory. */
-void get_home_dir(char *home, int size)
-{
-    struct passwd pwd;
-    struct passwd *pwdbuf;
-    const char *hmstr;
-    char buf[NSS_BUFLEN_PASSWD];
-
-    int rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf);
-
-    if (rc == 0) {
-        hmstr = pwd.pw_dir;
-    } else {
-        hmstr = getenv("HOME");
-
-        if (hmstr == NULL) {
-            return;
-        }
-
-        snprintf(buf, sizeof(buf), "%s", hmstr);
-        hmstr = buf;
-    }
-
-    snprintf(home, size, "%s", hmstr);
-}
 
 /**
- * @brief Get the user's config directory.
+ * @brief Get the users config directory.
  *
- * This is without a trailing slash. Resulting string must be freed.
+ * This is without a trailing slash.
  *
  * @return The users config dir or NULL on error.
  */
 char *get_user_config_dir(void)
 {
-    char home[NSS_BUFLEN_PASSWD] = {0};
-    get_home_dir(home, sizeof(home));
+    char *user_config_dir;
 
-    char *user_config_dir = NULL;
-    size_t len = 0;
+#ifndef NSS_BUFLEN_PASSWD
+#define NSS_BUFLEN_PASSWD 4096
+#endif /* NSS_BUFLEN_PASSWD */
+
+    struct passwd pwd;
+    struct passwd *pwdbuf;
+    const char *home;
+    char buf[NSS_BUFLEN_PASSWD];
+    size_t len;
+    int rc;
+
+    rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf);
+
+    if (rc == 0) {
+        home = pwd.pw_dir;
+    } else {
+        home = getenv("HOME");
+
+        if (home == NULL) {
+            return NULL;
+        }
+
+        /* env variables can be tainted */
+        snprintf(buf, sizeof(buf), "%s", home);
+        home = buf;
+    }
 
 # if defined(__APPLE__)
     len = strlen(home) + strlen("/Library/Application Support") + 1;
@@ -85,9 +84,9 @@ char *get_user_config_dir(void)
     snprintf(user_config_dir, len, "%s/Library/Application Support", home);
 # else /* __APPLE__ */
 
-    const char *tmp = getenv("XDG_CONFIG_HOME");
+    const char *tmp;
 
-    if (tmp == NULL) {
+    if (!(tmp = getenv("XDG_CONFIG_HOME"))) {
         len = strlen(home) + strlen("/.config") + 1;
         user_config_dir = malloc(len);
 
@@ -103,52 +102,34 @@ char *get_user_config_dir(void)
 # endif /* __APPLE__ */
 
     return user_config_dir;
+#undef NSS_BUFLEN_PASSWD
 }
 
-/* Creates the config and chatlog directories.
- *
- * Returns 0 on success.
- * Returns -1 on failure.
+/*
+ * Creates the config directory.
  */
-int create_user_config_dirs(char *path)
+int create_user_config_dir(char *path)
 {
+    int mkdir_err;
+
+    mkdir_err = mkdir(path, 0700);
     struct stat buf;
-    int mkdir_err = mkdir(path, 0700);
 
     if (mkdir_err && (errno != EEXIST || stat(path, &buf) || !S_ISDIR(buf.st_mode))) {
         return -1;
     }
 
     char *fullpath = malloc(strlen(path) + strlen(CONFIGDIR) + 1);
-    char *logpath = malloc(strlen(path) + strlen(LOGDIR) + 1);
-
-    if (fullpath == NULL || logpath == NULL) {
-        exit_toxic_err("failed in load_data_structures", FATALERR_MEMORY);
-    }
-
     strcpy(fullpath, path);
     strcat(fullpath, CONFIGDIR);
 
-    strcpy(logpath, path);
-    strcat(logpath, LOGDIR);
-
     mkdir_err = mkdir(fullpath, 0700);
 
     if (mkdir_err && (errno != EEXIST || stat(fullpath, &buf) || !S_ISDIR(buf.st_mode))) {
         free(fullpath);
-        free(logpath);
         return -1;
     }
 
-    mkdir_err = mkdir(logpath, 0700);
-
-    if (mkdir_err && (errno != EEXIST || stat(logpath, &buf) || !S_ISDIR(buf.st_mode))) {
-        free(fullpath);
-        free(logpath);
-        return -1;
-    }
-
-    free(logpath);
     free(fullpath);
     return 0;
 }

src/configdir.h

@@ -20,37 +20,17 @@
  *
  */
 
-#ifndef CONFIGDIR_H
-#define CONFIGDIR_H
-
-#ifndef NSS_BUFLEN_PASSWD
-#define NSS_BUFLEN_PASSWD 4096
-#endif
+#ifndef _configdir_h
+#define _configdir_h
 
 #define CONFIGDIR "/tox/"
-#define LOGDIR "/tox/chatlogs/"
 
 #ifndef S_ISDIR
 #define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
 #endif
 
-/**
- * @brief Get the user's config directory.
- *
- * This is without a trailing slash. Resulting string must be freed.
- *
- * @return The users config dir or NULL on error.
- */
 char *get_user_config_dir(void);
 
-/* get the user's home directory. */
-void get_home_dir(char *home, int size);
+int create_user_config_dir(char *path);
 
-/* Creates the config and chatlog directories.
- *
- * Returns 0 on success.
- * Returns -1 on failure.
- */
-int create_user_config_dirs(char *path);
-
-#endif /* CONFIGDIR_H */
+#endif /* #define _configdir_h */

src/curl_util.c

@@ -1,94 +0,0 @@
-/*  curl_util.c
- *
- *
- *  Copyright (C) 2016 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 <stdint.h>
-#include <string.h>
-
-#include <curl/curl.h>
-#include <tox/tox.h>
-
-#include "curl_util.h"
-
-/* Sets proxy info for given CURL handler.
- *
- * Returns 0 on success or if no proxy is set by the client.
- * Returns -1 if proxy info is invalid.
- * Returns an int > 0 on curl error (see: https://curl.haxx.se/libcurl/c/libcurl-errors.html)
- */
-int set_curl_proxy(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) {
-        return -1;
-    }
-
-    int ret = curl_easy_setopt(c_handle, CURLOPT_PROXYPORT, (long) port);
-
-    if (ret != CURLE_OK) {
-        return ret;
-    }
-
-    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) {
-        return ret;
-    }
-
-    ret = curl_easy_setopt(c_handle, CURLOPT_PROXY, proxy_address);
-
-    if (ret != CURLE_OK) {
-        return ret;
-    }
-
-    return 0;
-}
-
-/* Callback function for CURL to write received data.
- *
- * This function will append data from an http request to the data buffer
- * until the request is complete or the buffer is full. Buffer will be null terminated.
- *
- * Returns number of bytes received from http request on success (don't change this).
- * Returns 0 if data exceeds buffer size.
- */
-size_t curl_cb_write_data(void *data, size_t size, size_t nmemb, void *user_pointer)
-{
-    struct Recv_Curl_Data *recv_data = (struct Recv_Curl_Data *) user_pointer;
-
-    size_t length = size * nmemb;
-    size_t total_size = length + recv_data->length;
-
-    if (total_size > MAX_RECV_CURL_DATA_SIZE) {
-        return 0;
-    }
-
-    memcpy(recv_data->data + recv_data->length, data, length);
-    recv_data->data[total_size] = '\0';
-    recv_data->length += length;
-
-    return length;
-}

src/curl_util.h

@@ -1,57 +0,0 @@
-/*  curl_util.h
- *
- *
- *  Copyright (C) 2016 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 CURL_UTIL_H
-#define CURL_UTIL_H
-
-#include <stdint.h>
-
-/* 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"
-
-/* Max size of an http response that we can store in Recv_Data */
-#define MAX_RECV_CURL_DATA_SIZE 32767
-
-/* Holds data received from curl lookup */
-struct Recv_Curl_Data {
-    char data[MAX_RECV_CURL_DATA_SIZE + 1];   /* Data received from curl write data callback */
-    size_t length;  /* Total number of bytes written to data buffer (doesn't include null) */
-};
-
-/* Sets proxy info for given CURL handler.
- *
- * Returns 0 on success or if no proxy is set by the client.
- * Returns -1 if proxy info is invalid.
- * Returns an int > 0 on curl error (see: https://curl.haxx.se/libcurl/c/libcurl-errors.html)
- */
-int set_curl_proxy(CURL *c_handle, const char *proxy_address, uint16_t port, uint8_t proxy_type);
-
-/* Callback function for CURL to write received data.
- *
- * This function will append data from an http request to the data buffer
- * until the request is complete or the buffer is full. Buffer will be null terminated.
- *
- * Returns size of bytes written to the data buffer.
- */
-size_t curl_cb_write_data(void *data, size_t size, size_t nmemb, void *user_pointer);
-
-#endif /* CURL_UTIL_H */

src/dns.c

@@ -0,0 +1,304 @@
+/*  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/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
+#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"
+
+#define MAX_DNS_REQST_SIZE 256
+#define NUM_DNS3_SERVERS 2    /* must correspond to number of items in dns3_servers array */
+#define TOX_DNS3_TXT_PREFIX "v=tox3;id="
+#define DNS3_KEY_SZ 32
+
+/* TODO: process keys from key file instead of hard-coding like a noob */
+static struct dns3_server {
+    uint8_t *name;
+    uint8_t key[DNS3_KEY_SZ];
+} dns3_servers[] = {
+    {
+        "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;
+    uint8_t id_bin[TOX_FRIEND_ADDRESS_SIZE];
+    uint8_t addr[MAX_STR_SIZE];
+    uint8_t msg[MAX_STR_SIZE];
+    uint8_t busy;
+    Tox *m;
+} t_data;
+
+static struct _dns_thread {
+    pthread_t tid;
+    pthread_mutex_t lock;
+} dns_thread;
+
+static int dns_error(ToxWindow *self, uint8_t *errmsg)
+{
+    uint8_t msg[MAX_STR_SIZE];
+    snprintf(msg, sizeof(msg), "DNS lookup failed: %s", errmsg);
+
+    pthread_mutex_lock(&dns_thread.lock);
+    line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
+    pthread_mutex_unlock(&dns_thread.lock);
+
+    return -1;
+}
+
+static void kill_dns_thread(void *dns_obj)
+{
+    if (dns_obj)
+        tox_dns3_kill(dns_obj);
+
+    memset(&t_data, 0, sizeof(struct _thread_data));
+    pthread_exit(0);
+}
+
+/* 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, uint8_t *buf)
+{
+    uint8_t *ans_pt = answer + sizeof(HEADER);
+    uint8_t *ans_end = answer + ans_len;
+    uint8_t 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, "Reply was too short."); 
+
+    int type;
+    GETSHORT(type, ans_pt);
+
+    if (type != T_TXT)
+        return dns_error(self, "Broken 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, "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, "Not a TXT record."); 
+
+    uint32_t txt_len = *ans_pt;
+
+    if (!size || txt_len >= size || !txt_len)
+        return dns_error(self, "No record found.");
+
+    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(uint8_t *addr, uint8_t *namebuf, uint8_t *dombuf)
+{
+    uint8_t tmpaddr[MAX_STR_SIZE];
+    uint8_t *tmpname, *tmpdom;
+
+    strcpy(tmpaddr, addr);
+    tmpname = strtok(tmpaddr, "@");
+    tmpdom = strtok(NULL, "");
+
+    if (tmpname == NULL || tmpdom == NULL)
+        return -1;
+
+    str_to_lower(tmpdom);
+    strcpy(namebuf, tmpname);
+    strcpy(dombuf, tmpdom);
+
+    return strlen(namebuf);
+}
+
+/* Does DNS lookup for addr and puts resulting tox id in id_bin. */
+void *dns3_lookup_thread(void *data)
+{
+    ToxWindow *self = t_data.self;
+
+    uint8_t domain[MAX_STR_SIZE];
+    uint8_t name[MAX_STR_SIZE];
+
+    int namelen = parse_addr(t_data.addr, name, domain);
+
+    if (namelen == -1) {
+        dns_error(self, "Must be a Tox ID or an address in the form username@domain");
+        kill_dns_thread(NULL);
+    }
+
+    /* get domain name/pub key */
+    uint8_t *DNS_pubkey, *domname = NULL;
+    int i;
+
+    for (i = 0; i < NUM_DNS3_SERVERS; ++i) {
+        if (strcmp(dns3_servers[i].name, domain) == 0) {
+            DNS_pubkey = dns3_servers[i].key;
+            domname = dns3_servers[i].name;
+            break;
+        }
+    }
+
+    if (domname == NULL) {
+        dns_error(self, "Domain not found.");
+        kill_dns_thread(NULL);
+    }
+
+    void *dns_obj = tox_dns3_new(DNS_pubkey);
+
+    if (dns_obj == NULL) {
+        dns_error(self, "Core failed to create DNS object.");
+        kill_dns_thread(NULL);
+    }
+
+    uint8_t string[MAX_DNS_REQST_SIZE];
+    uint32_t request_id;
+
+    int str_len = tox_generate_dns3_string(dns_obj, string, sizeof(string), &request_id, name, namelen);
+
+    if (str_len == -1) {
+        dns_error(self, "Core failed to generate dns3 string.");
+        kill_dns_thread(dns_obj);
+    }
+
+    string[str_len] = '\0';
+
+    u_char answer[PACKETSZ];
+    uint8_t d_string[MAX_DNS_REQST_SIZE];
+
+    /* format string and create dns query */
+    snprintf(d_string, sizeof(d_string), "_%s._tox.%s", string, domname);
+    int ans_len = res_query(d_string, C_IN, T_TXT, answer, sizeof(answer));
+
+    if (ans_len <= 0) {
+        dns_error(self, "Query failed.");
+        kill_dns_thread(dns_obj);
+    }
+
+    uint8_t ans_id[MAX_DNS_REQST_SIZE];
+
+    /* extract TXT from DNS response */
+    if (parse_dns_response(self, answer, ans_len, ans_id) == -1)
+        kill_dns_thread(dns_obj);
+
+    uint8_t encrypted_id[MAX_DNS_REQST_SIZE];
+    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.");
+        kill_dns_thread(dns_obj);
+    }
+
+    memcpy(encrypted_id, ans_id + prfx_len, ans_len - prfx_len);
+
+    if (tox_decrypt_dns3_TXT(dns_obj, t_data.id_bin, encrypted_id, strlen(encrypted_id), request_id) == -1) {
+        dns_error(self, "Core failed to decrypt response.");
+        kill_dns_thread(dns_obj);
+    }
+
+    pthread_mutex_lock(&dns_thread.lock);
+    cmd_add_helper(self, t_data.m, t_data.id_bin, t_data.msg);
+    pthread_mutex_unlock(&dns_thread.lock);
+
+    kill_dns_thread(dns_obj);
+}
+
+/* creates new thread for dns3 lookup. Only allows one lookup at a time. */
+void dns3_lookup(ToxWindow *self, Tox *m, uint8_t *id_bin, uint8_t *addr, uint8_t *msg)
+{
+    if (t_data.busy) {
+        uint8_t *err = "Please wait for previous user lookup to finish.";
+        line_info_add(self, NULL, NULL, NULL, err, SYS_MSG, 0, 0);
+        return;
+    }
+
+    t_data.self = self;
+    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.m = m;
+    t_data.busy = 1;
+
+    if (pthread_create(&dns_thread.tid, NULL, dns3_lookup_thread, NULL) != 0)
+        exit_toxic_err("failed in dns3_lookup", FATALERR_THREAD_CREATE);
+
+    if (pthread_mutex_init(&dns_thread.lock, NULL) != 0)
+        exit_toxic_err("failed in dns3_lookup", FATALERR_MUTEX_INIT);
+}

src/dns.h

@@ -1,4 +1,4 @@
-/*  help.h
+/*  dns.c
  *
  *
  *  Copyright (C) 2014 Toxic All Rights Reserved.
@@ -20,27 +20,13 @@
  *
  */
 
-#ifndef HELP_H
-#define HELP_H
+/* Does DNS lookup for addr and puts resulting tox id in id_bin.
+   Return 0 on success, -1 on failure. */
 
-#include "toxic.h"
-#include "windows.h"
+#ifndef _dns_h
+#define _dns_h
 
-typedef enum {
-    HELP_MENU,
-    HELP_GLOBAL,
-    HELP_GROUP,
-    HELP_CHAT,
-    HELP_CONFERENCE,
-    HELP_KEYS,
-    HELP_CONTACTS,
-#ifdef PYTHON
-    HELP_PLUGIN,
-#endif
-} HELP_TYPES;
+/* creates new thread for dns3 lookup. Only allows one lookup at a time. */
+void dns3_lookup(ToxWindow *self, Tox *m, uint8_t *id_bin, uint8_t *addr, uint8_t *msg);
 
-void help_onDraw(ToxWindow *self);
-void help_init_menu(ToxWindow *self);
-void help_onKey(ToxWindow *self, wint_t key);
-
-#endif /* HELP_H */
+#endif /* #define _dns_h */

src/execute.c

@@ -20,21 +20,20 @@
  *
  */
 
-#include <assert.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
-#include "api.h"
-#include "chat_commands.h"
-#include "execute.h"
-#include "global_commands.h"
-#include "conference_commands.h"
-#include "groupchat_commands.h"
-#include "line_info.h"
-#include "misc_tools.h"
-#include "notify.h"
 #include "toxic.h"
 #include "windows.h"
+#include "execute.h"
+#include "chat_commands.h"
+#include "global_commands.h"
+#include "line_info.h"
 
 struct cmd_func {
     const char *name;
@@ -44,217 +43,84 @@ struct cmd_func {
 static struct cmd_func global_commands[] = {
     { "/accept",    cmd_accept        },
     { "/add",       cmd_add           },
-    { "/avatar",    cmd_avatar        },
     { "/clear",     cmd_clear         },
     { "/connect",   cmd_connect       },
-    { "/decline",   cmd_decline       },
     { "/exit",      cmd_quit          },
-    { "/conference", cmd_conference    },
-    { "/group",     cmd_groupchat     },
-#ifdef GAMES
-    { "/game",      cmd_game          },
-#endif
+    { "/groupchat", cmd_groupchat     },
     { "/help",      cmd_prompt_help   },
-    { "/join",      cmd_join          },
     { "/log",       cmd_log           },
     { "/myid",      cmd_myid          },
-#ifdef QRCODE
-    { "/myqr",      cmd_myqr          },
-#endif /* QRCODE */
     { "/nick",      cmd_nick          },
     { "/note",      cmd_note          },
-    { "/nospam",    cmd_nospam        },
     { "/q",         cmd_quit          },
     { "/quit",      cmd_quit          },
-    { "/requests",  cmd_requests      },
     { "/status",    cmd_status        },
-#ifdef AUDIO
+
+#ifdef _SUPPORT_AUDIO
     { "/lsdev",     cmd_list_devices  },
     { "/sdev",      cmd_change_device },
-#endif /* AUDIO */
-#ifdef VIDEO
-    { "/lsvdev",    cmd_list_video_devices  },
-    { "/svdev",     cmd_change_video_device },
-#endif /* VIDEO */
-#ifdef PYTHON
-    { "/run",       cmd_run           },
-#endif /* PYTHON */
-    { NULL,         NULL              },
+#endif /* _SUPPORT_AUDIO */
 };
 
 static struct cmd_func chat_commands[] = {
-    { "/cancel",    cmd_cancelfile        },
-    { "/cinvite",   cmd_conference_invite },
-    { "/cjoin",     cmd_conference_join   },
-    { "/gaccept",   cmd_group_accept      },
-    { "/invite",    cmd_group_invite      },
-#ifdef GAMES
-    { "/play",      cmd_game_join         },
-#endif
-    { "/savefile",  cmd_savefile          },
-    { "/sendfile",  cmd_sendfile          },
-#ifdef AUDIO
-    { "/call",      cmd_call              },
-    { "/answer",    cmd_answer            },
-    { "/reject",    cmd_reject            },
-    { "/hangup",    cmd_hangup            },
-    { "/mute",      cmd_mute              },
-    { "/sense",     cmd_sense             },
-    { "/bitrate",   cmd_bitrate           },
-#endif /* AUDIO */
-#ifdef VIDEO
-    { "/vcall",     cmd_vcall             },
-    { "/video",     cmd_video             },
-    { "/res",       cmd_res               },
-#endif /* VIDEO */
-    { NULL,         NULL                  },
+    { "/help",      cmd_chat_help   },
+    { "/invite",    cmd_groupinvite },
+    { "/join",      cmd_join_group  },
+    { "/savefile",  cmd_savefile    },
+    { "/sendfile",  cmd_sendfile    },
+
+#ifdef _SUPPORT_AUDIO
+    { "/call",      cmd_call        },
+    { "/cancel",    cmd_cancel      },
+    { "/answer",    cmd_answer      },
+    { "/reject",    cmd_reject      },
+    { "/hangup",    cmd_hangup      },
+#endif /* _SUPPORT_AUDIO */
 };
 
-static struct cmd_func conference_commands[] = {
-    { "/title",     cmd_conference_set_title },
-
-#ifdef AUDIO
-    { "/audio",     cmd_enable_audio },
-    { "/mute",      cmd_conference_mute   },
-    { "/ptt",       cmd_conference_push_to_talk },
-    { "/sense",     cmd_conference_sense  },
-#endif /* AUDIO */
-    { NULL,         NULL             },
-};
-
-static struct cmd_func groupchat_commands[] = {
-    { "/chatid",    cmd_chatid         },
-    { "/disconnect", cmd_disconnect     },
-    { "/ignore",    cmd_ignore         },
-    { "/kick",      cmd_kick           },
-    { "/list",      cmd_list           },
-    { "/locktopic", cmd_set_topic_lock },
-    { "/mod",       cmd_mod            },
-    { "/nick",      cmd_group_nick     },
-    { "/passwd",    cmd_set_passwd     },
-    { "/peerlimit", cmd_set_peerlimit  },
-    { "/privacy",   cmd_set_privacy    },
-    { "/rejoin",    cmd_rejoin         },
-    { "/silence",   cmd_silence        },
-    { "/topic",     cmd_set_topic      },
-    { "/unignore",  cmd_unignore       },
-    { "/unmod",     cmd_unmod          },
-    { "/unsilence", cmd_unsilence      },
-    { "/voice",     cmd_set_voice      },
-    { "/whois",     cmd_whois          },
-    { NULL,         NULL               },
-};
-
-/* Special commands are commands that only take one argument even if it contains spaces */
-static const char special_commands[][MAX_CMDNAME_SIZE] = {
-    "/add",
-    "/avatar",
-    "/gaccept",
-    "/group",
-    "/ignore",
-    "/kick",
-    "/mod",
-    "/nick",
-    "/note",
-    "/passwd",
-    "/silence",
-    "/topic",
-    "/unignore",
-    "/unmod",
-    "/unsilence",
-    "/whois",
-#ifdef PYTHON
-    "/run",
-#endif /* PYTHON */
-    "/sendfile",
-    "/title",
-    "/mute",
-    "",
-};
-
-/* Returns true if input command is in the special_commands array. */
-static bool is_special_command(const char *input)
-{
-    const int s = char_find(0, input, ' ');
-
-    for (int i = 0; special_commands[i][0] != '\0'; ++i) {
-        if (strncmp(input, special_commands[i], s) == 0) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-/* Parses commands in the special_commands array. Unlike parse_command, this function
- * does not split the input string at spaces.
- *
- * Returns the number of arguments.
- */
-static int parse_special_command(const char *input, char (*args)[MAX_STR_SIZE])
-{
-    int len = strlen(input);
-    int s = char_find(0, input, ' ');
-
-    memcpy(args[0], input, s);
-    args[0][s++] = '\0';    // increment to remove space after "/command "
-
-    if (s >= len) {
-        return 1;  // No additional args
-    }
-
-    memcpy(args[1], input + s, len - s);
-    args[1][len - s] = '\0';
-
-    return 2;
-}
-
 /* Parses input command and puts args into arg array.
- *
- * Returns the number of arguments.
- */
-static int parse_command(const char *input, char (*args)[MAX_STR_SIZE])
+   Returns number of arguments on success, -1 on failure. */
+static int parse_command(WINDOW *w, ToxWindow *self, char *cmd, char (*args)[MAX_STR_SIZE])
 {
-    if (is_special_command(input)) {
-        return parse_special_command(input, args);
-    }
-
-    char *cmd = strdup(input);
-
-    if (cmd == NULL) {
-        exit_toxic_err("failed in parse_command", FATALERR_MEMORY);
-    }
-
     int num_args = 0;
+    bool cmd_end = false;    /* flags when we get to the end of cmd */
+    char *end;               /* points to the end of the current arg */
 
     /* characters wrapped in double quotes count as one arg */
-    while (num_args < MAX_NUM_ARGS) {
-        int i = char_find(0, cmd, ' ');    // index of last char in an argument
-        memcpy(args[num_args], cmd, i);
-        args[num_args++][i] = '\0';
+    while (!cmd_end && num_args < MAX_NUM_ARGS) {
+        if (*cmd == '\"') {
+            end = strchr(cmd + 1, '\"');
 
-        if (cmd[i] == '\0') {  // no more args
-            break;
+            if (end++ == NULL) {    /* Increment past the end quote */
+                uint8_t *errmsg = "Invalid argument. Did you forget a closing \"?";
+                line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
+                return -1;
+            }
+
+            cmd_end = *end == '\0';
+        } else {
+            end = strchr(cmd, ' ');
+            cmd_end = end == NULL;
         }
 
-        char tmp[MAX_STR_SIZE];
-        snprintf(tmp, sizeof(tmp), "%s", &cmd[i + 1]);
-        strcpy(cmd, tmp);    // tmp will always fit inside cmd
+        if (!cmd_end)
+            *end++ = '\0';    /* mark end of current argument */
+
+        /* Copy from start of current arg to where we just inserted the null byte */
+        strcpy(args[num_args++], cmd);
+        cmd = end;
     }
 
-    free(cmd);
     return num_args;
 }
 
-/* Matches command to respective function.
- *
- * Returns 0 on match.
- * Returns 1 on no match
- */
-static int do_command(WINDOW *w, ToxWindow *self, Tox *m, int num_args, struct cmd_func *commands,
-                      char (*args)[MAX_STR_SIZE])
+/* Matches command to respective function. Returns 0 on match, 1 on no match */
+static int do_command(WINDOW *w, ToxWindow *self, Tox *m, int num_args, int num_cmds,
+                      struct cmd_func *commands, char (*args)[MAX_STR_SIZE])
 {
-    for (size_t i = 0; commands[i].name != NULL; ++i) {
+    int i;
+
+    for (i = 0; i < num_cmds; ++i) {
         if (strcmp(args[0], commands[i].name) == 0) {
             (commands[i].func)(w, self, m, num_args - 1, args);
             return 0;
@@ -264,61 +130,35 @@ static int do_command(WINDOW *w, ToxWindow *self, Tox *m, int num_args, struct c
     return 1;
 }
 
-void execute(WINDOW *w, ToxWindow *self, Tox *m, const char *input, int mode)
+void execute(WINDOW *w, ToxWindow *self, Tox *m, char *cmd, int mode)
 {
-    if (string_is_empty(input)) {
+    if (string_is_empty(cmd))
         return;
-    }
 
-    char args[MAX_NUM_ARGS][MAX_STR_SIZE];
-    int num_args = parse_command(input, args);
+    char args[MAX_NUM_ARGS][MAX_STR_SIZE] = {0};
+    int num_args = parse_command(w, self, cmd, args);
 
-    if (num_args <= 0) {
+    if (num_args == -1)
         return;
-    }
 
     /* Try to match input command to command functions. If non-global command mode is specified,
-     * try specified mode's commands first, then upon failure try global commands.
-     *
-     * Note: Global commands must come last in case of duplicate command names
-     */
+       try specified mode's commands first, then upon failure try global commands.
+
+       Note: Global commands must come last in case of duplicate command names */
     switch (mode) {
-        case CHAT_COMMAND_MODE: {
-            if (do_command(w, self, m, num_args, chat_commands, args) == 0) {
+        case CHAT_COMMAND_MODE:
+            if (do_command(w, self, m, num_args, CHAT_NUM_COMMANDS, chat_commands, args) == 0)
                 return;
-            }
 
             break;
-        }
-
-        case CONFERENCE_COMMAND_MODE: {
-            if (do_command(w, self, m, num_args, conference_commands, args) == 0) {
-                return;
-            }
 
+        case GROUPCHAT_COMMAND_MODE:
             break;
-        }
-
-        case GROUPCHAT_COMMAND_MODE: {
-            if (do_command(w, self, m, num_args, groupchat_commands, args) == 0) {
-                return;
-            }
-
-            break;
-        }
     }
 
-    if (do_command(w, self, m, num_args, global_commands, args) == 0) {
+    if (do_command(w, self, m, num_args, GLOBAL_NUM_COMMANDS, global_commands, args) == 0)
         return;
-    }
 
-#ifdef PYTHON
-
-    if (do_plugin_command(num_args, args) == 0) {
-        return;
-    }
-
-#endif
-
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid command.");
+    uint8_t *errmsg = "Invalid command.";
+    line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
 }

src/execute.h

@@ -20,21 +20,28 @@
  *
  */
 
-#ifndef EXECUTE_H
-#define EXECUTE_H
+#ifndef _execute_h
+#define _execute_h
 
 #include "toxic.h"
 #include "windows.h"
 
 #define MAX_NUM_ARGS 4     /* Includes command */
 
+#ifdef _SUPPORT_AUDIO
+#define GLOBAL_NUM_COMMANDS 16
+#define CHAT_NUM_COMMANDS 10
+#else
+#define GLOBAL_NUM_COMMANDS 14
+#define CHAT_NUM_COMMANDS 5
+#endif /* _SUPPORT_AUDIO */
+
 enum {
     GLOBAL_COMMAND_MODE,
     CHAT_COMMAND_MODE,
-    CONFERENCE_COMMAND_MODE,
     GROUPCHAT_COMMAND_MODE,
 };
 
-void execute(WINDOW *w, ToxWindow *self, Tox *m, const char *input, int mode);
+void execute(WINDOW *w, ToxWindow *self, Tox *m, char *cmd, int mode);
 
-#endif /* EXECUTE_H */
+#endif /* #define _execute_h */

src/file_senders.c

@@ -0,0 +1,130 @@
+/*  file_senders.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/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include "toxic.h"
+#include "windows.h"
+#include "file_senders.h"
+#include "line_info.h"
+
+FileSender file_senders[MAX_FILES];
+uint8_t max_file_senders_index;
+
+static void close_file_sender(int i)
+{
+    fclose(file_senders[i].file);
+    memset(&file_senders[i], 0, sizeof(FileSender));
+
+    int j;
+
+    for (j = max_file_senders_index; j > 0; --j) {
+        if (file_senders[j - 1].active)
+            break;
+    }
+
+    max_file_senders_index = j;
+}
+
+/* Should only be called on exit */
+void close_all_file_senders(void)
+{
+    int i;
+
+    for (i = 0; i < max_file_senders_index; ++i) {
+        if (file_senders[i].active)
+            fclose(file_senders[i].file);
+    }
+}
+
+void do_file_senders(Tox *m)
+{
+    uint8_t msg[MAX_STR_SIZE];
+    int i;
+
+    for (i = 0; i < max_file_senders_index; ++i) {
+        if (!file_senders[i].active)
+            continue;
+
+        ToxWindow *self = file_senders[i].toxwin;
+        uint8_t *pathname = file_senders[i].pathname;
+        int filenum = file_senders[i].filenum;
+        int32_t friendnum = file_senders[i].friendnum;
+        FILE *fp = file_senders[i].file;
+        uint64_t current_time = get_unix_time();
+
+        /* If file transfer has timed out kill transfer and send kill control */
+        if (timed_out(file_senders[i].timestamp, current_time, TIMEOUT_FILESENDER)) {
+            if (self->chatwin != NULL) {
+                snprintf(msg, sizeof(msg), "File transfer for '%s' timed out.", pathname);
+                line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
+                alert_window(file_senders[i].toxwin, WINDOW_ALERT_2, true);
+            }
+
+            tox_file_send_control(m, friendnum, 0, filenum, TOX_FILECONTROL_KILL, 0, 0);
+            close_file_sender(i);
+            continue;
+        }
+
+        while (true) {
+            if (tox_file_send_data(m, friendnum, filenum, file_senders[i].nextpiece,
+                                   file_senders[i].piecelen) == -1)
+                break;
+
+            file_senders[i].timestamp = current_time;
+            file_senders[i].piecelen = fread(file_senders[i].nextpiece, 1,
+                                             tox_file_data_size(m, friendnum), fp);
+
+            /* refresh line with percentage complete */
+            if (self->chatwin != NULL) {
+                uint64_t size = file_senders[i].size;
+                long double remain = (long double) tox_file_data_remaining(m, friendnum, filenum, 0);
+                long double pct_remain = 100;
+
+                if (remain)
+                    pct_remain = (1 - (remain / size)) * 100;
+
+                const uint8_t *name = file_senders[i].pathname;
+                snprintf(msg, sizeof(msg), "File transfer for '%s' accepted (%.1Lf%%)", name, pct_remain);
+                line_info_set(self, file_senders[i].line_id, msg);
+            }
+
+            if (file_senders[i].piecelen == 0) {
+                if (self->chatwin != NULL) {
+                    snprintf(msg, sizeof(msg), "File '%s' successfuly sent.", pathname);
+                    line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
+                    alert_window(file_senders[i].toxwin, WINDOW_ALERT_2, true);
+                }
+
+                tox_file_send_control(m, friendnum, 0, filenum, TOX_FILECONTROL_FINISHED, 0, 0);
+                close_file_sender(i);
+                break;
+            }
+        }
+    }
+}

src/file_senders.h

@@ -1,4 +1,4 @@
-/*  video_call.h
+/*  file_senders.h
  *
  *
  *  Copyright (C) 2014 Toxic All Rights Reserved.
@@ -20,24 +20,33 @@
  *
  */
 
-#ifndef VIDEO_CALL_H
-#define VIDEO_CALL_H
+#ifndef _filesenders_h
+#define _filesenders_h
 
-#include <tox/toxav.h>
+#include "toxic.h"
+#include "windows.h"
 
-#include "audio_call.h"
+#define FILE_PIECE_SIZE 2048    /* must be >= (MAX_CRYPTO_DATA_SIZE - 2) in toxcore/net_crypto.h */
+#define MAX_FILES 256
+#define TIMEOUT_FILESENDER 300
 
-#include "video_device.h"
+typedef struct {
+    FILE *file;
+    ToxWindow *toxwin;
+    int32_t friendnum;
+    bool active;
+    int filenum;
+    uint8_t nextpiece[FILE_PIECE_SIZE];
+    uint16_t piecelen;
+    uint8_t pathname[MAX_STR_SIZE];
+    uint64_t timestamp;
+    uint64_t size;
+    uint32_t line_id;
+} FileSender;
 
-/* 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(void);
-int start_video_transmission(ToxWindow *self, ToxAV *av, Call *call);
-int stop_video_transmission(Call *call, int friend_number);
+/* Should only be called on exit */
+void close_all_file_senders(void);
 
-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);
+void do_file_senders(Tox *m);
 
-#endif /* VIDEO_CALL_H */
+#endif  /* #define _filesenders_h */

src/file_transfers.c

@@ -1,421 +0,0 @@
-/*  file_transfers.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 <time.h>
-#include <unistd.h>
-
-#include "execute.h"
-#include "file_transfers.h"
-#include "friendlist.h"
-#include "line_info.h"
-#include "misc_tools.h"
-#include "notify.h"
-#include "toxic.h"
-#include "windows.h"
-
-extern FriendsList Friends;
-
-/* number of "#"'s in file transfer progress bar. Keep well below MAX_STR_SIZE */
-#define NUM_PROG_MARKS 50
-#define STR_BUF_SIZE 30
-
-/* creates initial progress line that will be updated during file transfer.
-   Assumes progline has room for at least MAX_STR_SIZE bytes */
-void init_progress_bar(char *progline)
-{
-    strcpy(progline, "0% [");
-
-    for (size_t i = 0; i < NUM_PROG_MARKS; ++i) {
-        strcat(progline, "-");
-    }
-
-    strcat(progline, "] 0.0 B/s");
-}
-
-/* prints a progress bar for file transfers. */
-void print_progress_bar(ToxWindow *self, double bps, double pct_done, uint32_t line_id)
-{
-    if (bps < 0 || pct_done < 0 || pct_done > 100) {
-        return;
-    }
-
-    char pct_str[STR_BUF_SIZE];
-    snprintf(pct_str, sizeof(pct_str), "%.1f%%", pct_done);
-
-    char bps_str[STR_BUF_SIZE];
-    bytes_convert_str(bps_str, sizeof(bps_str), bps);
-
-    char prog_line[NUM_PROG_MARKS + 1];
-    prog_line[0] = 0;
-
-    int n = pct_done / (100 / NUM_PROG_MARKS);
-    int i, j;
-
-    for (i = 0; i < n; ++i) {
-        strcat(prog_line, "=");
-    }
-
-    if (pct_done < 100) {
-        strcpy(prog_line + n, ">");
-    }
-
-    for (j = i; j < NUM_PROG_MARKS - 1; ++j) {
-        strcat(prog_line, "-");
-    }
-
-    size_t line_buf_size = strlen(pct_str) + NUM_PROG_MARKS + strlen(bps_str) + 7;
-    char *full_line = malloc(line_buf_size);
-
-    if (full_line == NULL) {
-        return;
-    }
-
-    snprintf(full_line, line_buf_size, "%s [%s] %s/s", pct_str, prog_line, bps_str);
-
-    line_info_set(self, line_id, full_line);
-
-    free(full_line);
-}
-
-static void refresh_progress_helper(ToxWindow *self, FileTransfer *ft)
-{
-    if (ft->state == FILE_TRANSFER_INACTIVE) {
-        return;
-    }
-
-    /* Timeout must be set to 1 second to show correct bytes per second */
-    if (!timed_out(ft->last_line_progress, 1)) {
-        return;
-    }
-
-    double remain = ft->file_size - ft->position;
-    double pct_done = remain > 0 ? (1 - (remain / ft->file_size)) * 100 : 100;
-    print_progress_bar(self, ft->bps, pct_done, ft->line_id);
-
-    ft->bps = 0;
-    ft->last_line_progress = get_unix_time();
-}
-
-/* refreshes active file transfer status bars.
- *
- * Return true if there is at least one active file transfer in either direction.
- */
-bool refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber)
-{
-    bool active = false;
-
-    for (size_t i = 0; i < MAX_FILES; ++i) {
-        FileTransfer *ft_r = &Friends.list[friendnumber].file_receiver[i];
-        FileTransfer *ft_s = &Friends.list[friendnumber].file_sender[i];
-
-        refresh_progress_helper(self, ft_r);
-        refresh_progress_helper(self, ft_s);
-
-        if (ft_r->state !=  FILE_TRANSFER_INACTIVE || ft_s->state != FILE_TRANSFER_INACTIVE) {
-            active = true;
-        }
-    }
-
-    return active;
-}
-
-static void clear_file_transfer(FileTransfer *ft)
-{
-    *ft = (FileTransfer) {
-        0
-    };
-}
-
-/* Returns a pointer to friendnumber's FileTransfer struct associated with filenumber.
- * Returns NULL if filenumber is invalid.
- */
-FileTransfer *get_file_transfer_struct(uint32_t friendnumber, uint32_t filenumber)
-{
-    for (size_t i = 0; i < MAX_FILES; ++i) {
-        FileTransfer *ft_send = &Friends.list[friendnumber].file_sender[i];
-
-        if (ft_send->state != FILE_TRANSFER_INACTIVE && ft_send->filenumber == filenumber) {
-            return ft_send;
-        }
-
-        FileTransfer *ft_recv = &Friends.list[friendnumber].file_receiver[i];
-
-        if (ft_recv->state != FILE_TRANSFER_INACTIVE && ft_recv->filenumber == filenumber) {
-            return ft_recv;
-        }
-    }
-
-    return NULL;
-}
-
-/* Returns a pointer to the FileTransfer struct associated with index with the direction specified.
- * Returns NULL on failure.
- */
-FileTransfer *get_file_transfer_struct_index(uint32_t friendnumber, uint32_t index,
-        FILE_TRANSFER_DIRECTION direction)
-{
-    if (direction != FILE_TRANSFER_RECV && direction != FILE_TRANSFER_SEND) {
-        return NULL;
-    }
-
-    for (size_t i = 0; i < MAX_FILES; ++i) {
-        FileTransfer *ft = direction == FILE_TRANSFER_SEND ?
-                           &Friends.list[friendnumber].file_sender[i] :
-                           &Friends.list[friendnumber].file_receiver[i];
-
-        if (ft->state != FILE_TRANSFER_INACTIVE && ft->index == index) {
-            return ft;
-        }
-    }
-
-    return NULL;
-}
-
-/* Returns a pointer to an unused file sender.
- * Returns NULL if all file senders are in use.
- */
-static FileTransfer *new_file_sender(ToxWindow *window, uint32_t friendnumber, uint32_t filenumber, uint8_t type)
-{
-    for (size_t i = 0; i < MAX_FILES; ++i) {
-        FileTransfer *ft = &Friends.list[friendnumber].file_sender[i];
-
-        if (ft->state == FILE_TRANSFER_INACTIVE) {
-            clear_file_transfer(ft);
-            ft->window = window;
-            ft->index = i;
-            ft->friendnumber = friendnumber;
-            ft->filenumber = filenumber;
-            ft->file_type = type;
-            ft->state = FILE_TRANSFER_PENDING;
-            return ft;
-        }
-    }
-
-    return NULL;
-}
-
-/* Returns a pointer to an unused file receiver.
- * Returns NULL if all file receivers are in use.
- */
-static FileTransfer *new_file_receiver(ToxWindow *window, uint32_t friendnumber, uint32_t filenumber,
-                                       uint8_t type)
-{
-    for (size_t i = 0; i < MAX_FILES; ++i) {
-        FileTransfer *ft = &Friends.list[friendnumber].file_receiver[i];
-
-        if (ft->state == FILE_TRANSFER_INACTIVE) {
-            clear_file_transfer(ft);
-            ft->window = window;
-            ft->index = i;
-            ft->friendnumber = friendnumber;
-            ft->filenumber = filenumber;
-            ft->file_type = type;
-            ft->state = FILE_TRANSFER_PENDING;
-            return ft;
-        }
-    }
-
-    return NULL;
-}
-
-/* Initializes an unused file transfer and returns its pointer.
- * Returns NULL on failure.
- */
-FileTransfer *new_file_transfer(ToxWindow *window, uint32_t friendnumber, uint32_t filenumber,
-                                FILE_TRANSFER_DIRECTION direction, uint8_t type)
-{
-    if (direction == FILE_TRANSFER_RECV) {
-        return new_file_receiver(window, friendnumber, filenumber, type);
-    }
-
-    if (direction == FILE_TRANSFER_SEND) {
-        return new_file_sender(window, friendnumber, filenumber, type);
-    }
-
-    return NULL;
-}
-
-int file_send_queue_add(uint32_t friendnumber, const char *file_path, size_t length)
-{
-    if (length == 0 || file_path == NULL) {
-        return -1;
-    }
-
-    if (length > TOX_MAX_FILENAME_LENGTH) {
-        return -2;
-    }
-
-    for (size_t i = 0; i < MAX_FILES; ++i) {
-        PendingFileTransfer *pending_slot = &Friends.list[friendnumber].file_send_queue[i];
-
-        if (pending_slot->pending) {
-            continue;
-        }
-
-        pending_slot->pending = true;
-
-        memcpy(pending_slot->file_path, file_path, length);
-        pending_slot->file_path[length] = 0;
-        pending_slot->length = length;
-
-        return i;
-    }
-
-    return -3;
-}
-
-#define FILE_TRANSFER_SEND_CMD "/sendfile "
-#define FILE_TRANSFER_SEND_LEN (sizeof(FILE_TRANSFER_SEND_CMD) - 1)
-
-void file_send_queue_check(ToxWindow *self, Tox *m, uint32_t friendnumber)
-{
-    for (size_t i = 0; i < MAX_FILES; ++i) {
-        PendingFileTransfer *pending_slot = &Friends.list[friendnumber].file_send_queue[i];
-
-        if (!pending_slot->pending) {
-            continue;
-        }
-
-        char command[TOX_MAX_FILENAME_LENGTH + FILE_TRANSFER_SEND_LEN + 1];
-        snprintf(command, sizeof(command), "%s%s", FILE_TRANSFER_SEND_CMD, pending_slot->file_path);
-
-        execute(self->window, self, m, command, CHAT_COMMAND_MODE);
-
-        *pending_slot = (PendingFileTransfer) {
-            0,
-        };
-    }
-}
-
-int file_send_queue_remove(uint32_t friendnumber, size_t index)
-{
-    if (index >= MAX_FILES) {
-        return -1;
-    }
-
-    PendingFileTransfer *pending_slot = &Friends.list[friendnumber].file_send_queue[index];
-
-    if (!pending_slot->pending) {
-        return -1;
-    }
-
-    *pending_slot = (PendingFileTransfer) {
-        0,
-    };
-
-    return 0;
-}
-
-/* Closes file transfer ft.
- *
- * Set CTRL to -1 if we don't want to send a control signal.
- * Set message or self to NULL if we don't want to display a message.
- */
-void close_file_transfer(ToxWindow *self, Tox *m, FileTransfer *ft, int CTRL, const char *message,
-                         Notification sound_type)
-{
-    if (!ft) {
-        return;
-    }
-
-    if (ft->state == FILE_TRANSFER_INACTIVE) {
-        return;
-    }
-
-    if (ft->file) {
-        fclose(ft->file);
-    }
-
-    if (CTRL >= 0) {
-        Tox_Err_File_Control err;
-
-        if (!tox_file_control(m, ft->friendnumber, ft->filenumber, (Tox_File_Control) CTRL, &err)) {
-            fprintf(stderr, "Failed to cancel file transfer: %d\n", err);
-        }
-    }
-
-    if (message && self) {
-        if (self->active_box != -1 && sound_type != silent) {
-            box_notify2(self, sound_type, NT_NOFOCUS | NT_WNDALERT_2, self->active_box, "%s", message);
-        } else {
-            box_notify(self, sound_type, NT_NOFOCUS | NT_WNDALERT_2, &self->active_box, self->name, "%s", message);
-        }
-
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", message);
-    }
-
-    clear_file_transfer(ft);
-}
-
-/* Kills active outgoing avatar file transfers for friendnumber */
-void kill_avatar_file_transfers_friend(Tox *m, uint32_t friendnumber)
-{
-    for (size_t i = 0; i < MAX_FILES; ++i) {
-        FileTransfer *ft = &Friends.list[friendnumber].file_sender[i];
-
-        if (ft->file_type == TOX_FILE_KIND_AVATAR) {
-            close_file_transfer(NULL, m, ft, TOX_FILE_CONTROL_CANCEL, NULL, silent);
-        }
-    }
-}
-
-/* Kills all active file transfers for friendnumber */
-void kill_all_file_transfers_friend(Tox *m, uint32_t friendnumber)
-{
-    for (size_t i = 0; i < MAX_FILES; ++i) {
-        close_file_transfer(NULL, m, &Friends.list[friendnumber].file_sender[i], TOX_FILE_CONTROL_CANCEL, NULL, silent);
-        close_file_transfer(NULL, m, &Friends.list[friendnumber].file_receiver[i], TOX_FILE_CONTROL_CANCEL, NULL, silent);
-        file_send_queue_remove(friendnumber, i);
-    }
-}
-
-void kill_all_file_transfers(Tox *m)
-{
-    for (size_t i = 0; i < Friends.max_idx; ++i) {
-        kill_all_file_transfers_friend(m, Friends.list[i].num);
-    }
-}
-
-bool file_transfer_recv_path_exists(const char *path)
-{
-    for (size_t friendnumber = 0; friendnumber < Friends.max_idx; ++friendnumber) {
-        if (!Friends.list[friendnumber].active) {
-            continue;
-        }
-
-        for (size_t i = 0; i < MAX_FILES; ++i) {
-            FileTransfer *ft = &Friends.list[friendnumber].file_receiver[i];
-
-            if (ft->state == FILE_TRANSFER_INACTIVE) {
-                continue;
-            }
-
-            if (strcmp(path, ft->file_path) == 0) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}

src/file_transfers.h

@@ -1,151 +0,0 @@
-/*  file_transfers.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 FILE_TRANSFERS_H
-#define FILE_TRANSFERS_H
-
-#include <limits.h>
-
-#include "notify.h"
-#include "toxic.h"
-#include "windows.h"
-
-#define KiB (uint32_t)  1024
-#define MiB (uint32_t) (1024 << 10)  /* 1024^2 */
-#define GiB (uint32_t) (1024 << 20)  /* 1024^3 */
-
-#define MAX_FILES 32
-
-typedef enum FILE_TRANSFER_STATE {
-    FILE_TRANSFER_INACTIVE,
-    FILE_TRANSFER_PAUSED,
-    FILE_TRANSFER_PENDING,
-    FILE_TRANSFER_STARTED,
-} FILE_TRANSFER_STATE;
-
-typedef enum FILE_TRANSFER_DIRECTION {
-    FILE_TRANSFER_SEND,
-    FILE_TRANSFER_RECV
-} FILE_TRANSFER_DIRECTION;
-
-typedef struct FileTransfer {
-    ToxWindow *window;
-    FILE *file;
-    FILE_TRANSFER_STATE state;
-    uint8_t file_type;
-    char file_name[TOX_MAX_FILENAME_LENGTH + 1];
-    char file_path[PATH_MAX + 1];    /* Not used by senders */
-    double   bps;
-    uint32_t filenumber;
-    uint32_t friendnumber;
-    size_t   index;
-    uint64_t file_size;
-    uint64_t position;
-    time_t   last_line_progress;   /* The last time we updated the progress bar */
-    uint32_t line_id;
-    uint8_t  file_id[TOX_FILE_ID_LENGTH];
-} FileTransfer;
-
-typedef struct PendingFileTransfer {
-    char      file_path[TOX_MAX_FILENAME_LENGTH + 1];
-    size_t    length;
-    uint32_t  friendnumber;
-    bool      pending;
-} PendingFileTransfer;
-
-
-/* creates initial progress line that will be updated during file transfer.
-   progline must be at lesat MAX_STR_SIZE bytes */
-void init_progress_bar(char *progline);
-
-/* prints a progress bar for file transfers */
-void print_progress_bar(ToxWindow *self, double pct_done, double bps, uint32_t line_id);
-
-/* refreshes active file transfer status bars.
- *
- * Return true if there is at least one active file transfer in either direction.
- */
-bool refresh_file_transfer_progress(ToxWindow *self, uint32_t friendnumber);
-
-/* Returns a pointer to friendnumber's FileTransfer struct associated with filenumber.
- * Returns NULL if filenumber is invalid.
- */
-struct FileTransfer *get_file_transfer_struct(uint32_t friendnumber, uint32_t filenumber);
-
-
-/* Returns a pointer to the FileTransfer struct associated with index with the direction specified.
- * Returns NULL on failure.
- */
-struct FileTransfer *get_file_transfer_struct_index(uint32_t friendnumber, uint32_t index,
-        FILE_TRANSFER_DIRECTION direction);
-
-/* Initializes an unused file transfer and returns its pointer.
- * Returns NULL on failure.
- */
-struct FileTransfer *new_file_transfer(ToxWindow *window, uint32_t friendnumber, uint32_t filenumber,
-                                       FILE_TRANSFER_DIRECTION direction, uint8_t type);
-
-/* Adds a file designated by `file_path` of length `length` to the file transfer queue.
- *
- * Items in this queue will be automatically sent to the contact designated by `friendnumber`
- * as soon as they appear online. The item will then be removed from the queue whether
- * or not the transfer successfully initiates.
- *
- * If the ToxWindow associated with this friend is closed, all queued items will be
- * discarded.
- *
- * Return the queue index on success.
- * Return -1 if the length is invalid.
- * Return -2 if the send queue is full.
- */
-int file_send_queue_add(uint32_t friendnumber, const char *file_path, size_t length);
-
-/* Initiates all file transfers from the file send queue for friend designated by `friendnumber`. */
-void file_send_queue_check(ToxWindow *self, Tox *m, uint32_t friendnumber);
-
-/* Removes the `index`-th item from the file send queue for `friendnumber`.
- *
- * Return 0 if a pending transfer was successfully removed
- * Return -1 if index does not designate a pending file transfer.
- */
-int file_send_queue_remove(uint32_t friendnumber, size_t index);
-
-/* Closes file transfer ft.
- *
- * Set CTRL to -1 if we don't want to send a control signal.
- * Set message or self to NULL if we don't want to display a message.
- */
-void close_file_transfer(ToxWindow *self, Tox *m, struct FileTransfer *ft, int CTRL, const char *message,
-                         Notification sound_type);
-
-/* Kills active outgoing avatar file transfers for friendnumber */
-void kill_avatar_file_transfers_friend(Tox *m, uint32_t friendnumber);
-
-/* Kills all active file transfers for friendnumber */
-void kill_all_file_transfers_friend(Tox *m, uint32_t friendnumber);
-
-void kill_all_file_transfers(Tox *m);
-
-/* Return true if any pending or active file receiver has the path `path`. */
-bool file_transfer_recv_path_exists(const char *path);
-
-#endif /* FILE_TRANSFERS_H */