Fix memory leaks upon disconnect

.gitignore

@@ -7,20 +7,31 @@ compile
 aclocal.m4
 config.log
 config.status
+config.guess
+config.sub
 depcomp
 autom4te.cache
+libtool
+ltmain.sh
 .dirstamp
 .deps
 .sconsign*
+src/*.lo
 src/*.o
 examples/*.o
 tests/*.o
 tests/check_parser
+*.la
 *.a
 *.tar.gz
 *.zip
+*.pc
+*~
+*.swp
 docs/html
 TAGS
+tags
+cscope.out
 examples/basic
 examples/active
 examples/roster
@@ -33,3 +44,6 @@ tests/test_hash
 tests/test_jid
 tests/test_sasl
 tests/test_sock
+.libs/
+examples/.libs/
+src/.libs/

Makefile.am

@@ -1,58 +1,38 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-CFLAGS = -g -Wall
+COUPLET_LIBS = libcouplet.la
 
-PARSER_CFLAGS=@PARSER_CFLAGS@
-PARSER_LIBS=@PARSER_LIBS@
-
-SSL_LIBS = -lssl -lcrypto -lz
-
-STROPHE_FLAGS = -I$(top_srcdir)
-STROPHE_LIBS = libstrophe.a $(PARSER_LIBS) $(SSL_LIBS)
+pkgconfigdir = $(libdir)/pkgconfig
 
 ## Main build targets
-lib_LIBRARIES = libstrophe.a
+lib_LTLIBRARIES = libcouplet.la
 
-libstrophe_a_CFLAGS=$(STROPHE_FLAGS) $(PARSER_CFLAGS)
-libstrophe_a_SOURCES = src/auth.c src/conn.c src/ctx.c \
+libcouplet_la_SOURCES = src/auth.c src/conn.c src/ctx.c \
 	src/event.c src/handler.c src/hash.c \
 	src/jid.c src/md5.c src/sasl.c src/sha1.c \
 	src/snprintf.c src/sock.c src/stanza.c src/thread.c \
-	src/tls_openssl.c src/util.c \
+	src/tls_openssl.c src/util.c src/list.c \
 	src/common.h src/hash.h src/md5.h src/ostypes.h src/parser.h \
-	src/sasl.h src/sha1.h src/sock.h src/thread.h src/tls.h src/util.h
+	src/sasl.h src/sha1.h src/sock.h src/thread.h src/tls.h src/util.h \
+	src/list.h
 
 if PARSER_EXPAT
-libstrophe_a_SOURCES += src/parser_expat.c
+libcouplet_la_SOURCES += src/parser_expat.c
 else
-libstrophe_a_SOURCES += src/parser_libxml2.c
+libcouplet_la_SOURCES += src/parser_libxml2.c
 endif
 
-include_HEADERS = strophe.h
-noinst_HEADERS = strophepp.h
+include_HEADERS = couplet.h
+noinst_HEADERS = coupletpp.h
 
 EXTRA_DIST = docs
 
-## Examples
-noinst_PROGRAMS = examples/active examples/roster examples/basic examples/bot
-examples_active_SOURCES = examples/active.c
-examples_active_CFLAGS = $(STROPHE_FLAGS)
-examples_active_LDADD = $(STROPHE_LIBS) 
-examples_roster_SOURCES = examples/roster.c
-examples_roster_CFLAGS = $(STROPHE_FLAGS)
-examples_roster_LDADD = $(STROPHE_LIBS) 
-examples_basic_SOURCES = examples/basic.c
-examples_basic_CFLAGS = $(STROPHE_FLAGS)
-examples_basic_LDADD = $(STROPHE_LIBS) 
-examples_bot_SOURCES = examples/bot.c
-examples_bot_CFLAGS = $(STROPHE_FLAGS)
-examples_bot_LDADD = $(STROPHE_LIBS) 
-
+pkgconfig_DATA = libcouplet.pc
 
 ## Tests
 TESTS = tests/check_parser
 check_PROGRAMS = tests/check_parser
 tests_check_parser_SOURCES = tests/check_parser.c tests/test.h
-tests_check_parser_CFLAGS = @check_CFLAGS@ $(PARSER_CFLAGS) $(STROPHE_FLAGS) \
+tests_check_parser_CFLAGS = @check_CFLAGS@ $(AM_CFLAGS) \
 	-I$(top_srcdir)/src
-tests_check_parser_LDADD = @check_LIBS@ $(STROPHE_LIBS)
+tests_check_parser_LDADD = @check_LIBS@ $(COUPLET_LIBS)

README.markdown

@@ -1,14 +1,8 @@
-# libstrophe
+# libcouplet
 
-libstrophe is a lightweight XMPP client library written in C. It has
-minimal dependencies and is configurable for various environments. It
-runs well on both Linux, Unix, and Windows based platforms.
-
-Its goals are:
-
-- usable quickly
-- well documented
-- reliable
+libcouplet is a fork of libstrophe - a lightweight XMPP client library
+written in C. Goal of the fork is make library suitable for multi-thread
+applications.
 
 ## Build Instructions
 
@@ -23,27 +17,33 @@ From the top-level directory, run the following commands:
     ./configure
     make
 
-This will create a static library, also in the top-level
-directory, which can be linked into other programs. The 
-public API is defined in `strophe.h` which is also in the
-top-level directory.
-
 The `examples` directory contains some examples of how to
 use the library; these may be helpful in addition to the
 API documentation
 
 ## Requirements
 
-libstrophe requires:
+libcouplet requires:
 
 - expat or libxml2 - expat is the default; use --with-libxml2 to
   switch
+- openssl
 - libresolv on UNIX systems - make sure you include -lresolv
-  if you are compiling by hand. 
+  if you are compiling by hand.
 
 In addition, if you wish to run the unit tests, you will need the
 check package.
 
+Windows systems aren't supported for now.
+
+### Gentoo
+
+libcouplet can be installed from Gentoo overlay 'stuff':
+
+    layman -a stuff
+    echo =dev-libs/libcouplet-9999 ** >> /etc/portage/package.keywords
+    emerge libcouplet
+
 ### OS X (with Homebrew package manager)
 
 You can install the requirements with:

bootstrap.sh

@@ -5,6 +5,7 @@ if [ -d /usr/local/share/aclocal ]; then
     ACFLAGS="-I /usr/local/share/aclocal"
 fi
 
+libtoolize
 aclocal ${ACFLAGS}
 automake --add-missing --foreign --copy
 autoconf

configure.ac

@@ -1,48 +1,50 @@
-AC_INIT([libstrophe], [0.8-snapshot], [[email protected]])
+AC_INIT([libcouplet], [0.8], [[email protected]])
 AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile libcouplet.pc])
 
 AC_PROG_CC
-AC_PROG_RANLIB
 AM_PROG_CC_C_O
-
-AC_CHECK_HEADER(openssl/ssl.h, [], [AC_MSG_ERROR([couldn't find openssl headers, openssl required])])
-PKG_CHECK_MODULES([check], [check >= 0.9.4], [], [AC_MSG_WARN([libcheck not found; unit tests will not be compilable])])
+LT_INIT
 
 AC_ARG_WITH([libxml2],
-            [AS_HELP_STRING([--with-libxml2], [use libxml2 for XML parsing])],
-            [with_libxml2=check],
-            [with_libxml2=no])
-
-if test "x$with_libxml2" != xno; then
-  PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7],
-                    [with_libxml2=yes],
-                    [AC_MSG_ERROR([couldn't find libxml2])])
-else
-  AC_CHECK_HEADER(expat.h, [], [AC_MSG_ERROR([couldn't find expat headers; expat required])])
+            [AS_HELP_STRING([--with-libxml2], [use libxml2 for XML parsing])])
+
+PKG_CHECK_MODULES([openssl], [openssl], [],
+    [AC_MSG_ERROR([openssl is required for libcouplet])])
+PKG_CHECK_MODULES([check], [check >= 0.9.4], [],
+    [AC_MSG_WARN([libcheck not found; unit tests will not be compilable])])
+AC_CHECK_LIB(pthread, pthread_create, [],
+    [AC_MSG_ERROR([pthread support is required])])
+AC_CHECK_LIB(resolv, res_query, [],
+    [AC_MSG_ERROR([libresolv is not found])])
+
+if test "x$with_libxml2" = xyes; then
+    PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7], [],
+        [AC_MSG_ERROR([libxml2 is required for libcouplet])])
+else 
+    PKG_CHECK_MODULES([expat], [expat], [],
+        [AC_MSG_ERROR([expat is required for libcouplet])])
 fi
 
 if test "x$with_libxml2" = xyes; then
-  with_parser=libxml2
   PARSER_NAME=libxml2
-  PARSER_CFLAGS=\$\(libxml2_CFLAGS\)
-  PARSER_LIBS=\$\(libxml2_LIBS\)
+  LIBS="$LIBS $libxml2_LIBS"
+  AM_CFLAGS="$AM_CFLAGS $libxml2_CFLAGS"
 else
-  with_parser=expat
   PARSER_NAME=expat
-  PARSER_CFLAGS=
-  PARSER_LIBS=-lexpat
+  LIBS="$LIBS $expat_LIBS"
+  AM_CFLAGS="$AM_CFLAGS $expat_CFLAGS"
 fi
 
-AC_MSG_NOTICE([libstrophe will use the $with_parser XML parser])
-AC_SEARCH_LIBS([socket], [socket])
+LIBS="$LIBS $openssl_LIBS"
+AM_CFLAGS="$AM_CFLAGS $openssl_CFLAGS -I. -Wall"
 
-AC_LINK_IFELSE([AC_LANG_CALL([#include <resolv.h>], [res_query])], [],[LIBS="$LIBS -lresolv"])
+AC_MSG_NOTICE([libcouplet will use the $PARSER_NAME XML parser])
+AC_SEARCH_LIBS([socket], [socket])
 
 AC_CHECK_HEADERS([arpa/nameser_compat.h])
 
-AM_CONDITIONAL([PARSER_EXPAT], [test x$with_parser != xlibxml2])
+AM_CONDITIONAL([PARSER_EXPAT], [test x$PARSER_NAME != xlibxml2])
 AC_SUBST(PARSER_NAME)
-AC_SUBST(PARSER_CFLAGS)
-AC_SUBST(PARSER_LIBS)
-AC_CONFIG_FILES([Makefile])
+AC_SUBST(AM_CFLAGS)
 AC_OUTPUT