Renamed to dsock

Signed-off-by: Martin Sustrik <[email protected]>

Author: sustrik

.gitignore

@@ -17,16 +17,14 @@ Makefile.in
 config.h
 config.log
 config.status
-dillsocks.pc
+dsock.pc
 libtool
 *.o
 *.lo
 dns/.dirstamp
-libdillsocks.la
+libdsock.la
 test-suite.log
 tests/.dirstamp
 tests/*.log
 tests/*.trs
 tests/helpers
-tests/tcp
-tests/sf

Makefile.am

@@ -23,47 +23,39 @@
 ACLOCAL_AMFLAGS = -I m4
 
 ################################################################################
-#  dillsocks library                                                           #
+#  dsock library                                                               #
 ################################################################################
 
-dillsocksincludedir = $(includedir)
-dillsocksinclude_HEADERS = dillsocks.h
+dsockincludedir = $(includedir)
+dsockinclude_HEADERS = dsock.h
 
-lib_LTLIBRARIES = libdillsocks.la
+lib_LTLIBRARIES = libdsock.la
 
-libdillsocks_la_SOURCES = \
-    bsock.c \
-    dbuf.h \
+libdsock_la_SOURCES = \
     ip.c \
     helpers.c \
-    msock.c \
-    sf.c \
-    tcp.c \
     utils.h \
     utils.c \
     dns/dns.h \
     dns/dns.c
 
-libdillsocks_la_LDFLAGS = -no-undefined -version-info \
-    @DILLSOCKS_LIBTOOL_VERSION@
+libdsock_la_LDFLAGS = -no-undefined -version-info \
+    @DSOCK_LIBTOOL_VERSION@
 
-libdillsocks_la_CFLAGS = \
+libdsock_la_CFLAGS = \
     -fvisibility=hidden\
-    -DDILLSOCKS_EXPORTS
+    -DDSOCK_EXPORTS
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dillsocks.pc
+pkgconfig_DATA = dsock.pc
 
 ################################################################################
 #  automated tests                                                             #
 ################################################################################
 
-check_PROGRAMS =  \
-    tests/helpers \
-    tests/tcp \
-    tests/sf
+check_PROGRAMS =
 
-LDADD = libdillsocks.la
+LDADD = libdsock.la
 
 TESTS = $(check_PROGRAMS)
 

README.md

@@ -1,49 +1 @@
-**Dillsocks: Protocol library for libdill**
-
-This project is an experiment. Do not use!
-
-Principles:
-
-1. The goal is to allow for true micro-protocol that can be composed like
-   lego blocks to form full-fledged protocols.
-2. Currently we have big protocols (hundreds of pages, e.g. 3GPP) and small
-   protocols (tens of pages, e.g. IETF). We want microprotocols (specification
-   one paragraph long).
-3. To achieve that we need vertical composability (e.g. TCP on top of IP;
-   HTTP on top of TCP)...
-4. And horizontal composability (e.g. HTTP switches to WebSockets; STARTTLS)
-5. Protocol initiation and termination is not abstracted; must be done in
-   protocol-specific way.
-6. Sending data and receiving data is abstracted. Two abstractions are used:
-   bytestream and messages.
-7. Sending and receiving must not presuppose each other.
-8. Sending and receiving with metadata (as with sndmsg, recvmsg) is not
-   abstracted and must be done in protocol specific way.
-9. The system must be able to support purely "structural" protocols, for example
-   one that joins two uni-directional protocols into a single bi-directional
-   one.
-
-Some protocols have to be supplied out of the box, to give people something
-to play with in the beginning. Options include:
-
-1. TCP bytestream
-2. UNIX domain bytestream
-3. UDP
-4. Simple framing (size + data)
-5. Line protocol (CRLF-terminated lines of text)
-6. HTTP
-7. WebSockets
-8. SMTP
-9. Version and/or capability negotiation protocol
-10. SSL
-11. TCPMUX
-12. WebSocketMUX
-13. PGM
-14. DCCP
-
-Structural protocols:
-
-1. Redirecting to/from file.
-2. Combining two unidirectional protocols into one bi-directional
-3. Splitting bi-directional protocol into two uni-directional
-3. Throttler (both for bytestreams and messages)
+**Dsock: Socket library for libdill**

abi_version.sh

@@ -20,17 +20,17 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-if [ ! -f dillsocks.h ]; then
-    echo "abi_version.sh: error: dillsocks.h does not exist" 1>&2
+if [ ! -f dsock.h ]; then
+    echo "abi_version.sh: error: dsock.h does not exist" 1>&2
     exit 1
 fi
 
-CURRENT=`egrep '^#define +DILLSOCKS_VERSION_CURRENT +[0-9]+$' dillsocks.h`
-REVISION=`egrep '^#define +DILLSOCKS_VERSION_REVISION +[0-9]+$' dillsocks.h`
-AGE=`egrep '^#define +DILLSOCKS_VERSION_AGE +[0-9]+$' dillsocks.h`
+CURRENT=`egrep '^#define +DSOCK_VERSION_CURRENT +[0-9]+$' dsock.h`
+REVISION=`egrep '^#define +DSOCK_VERSION_REVISION +[0-9]+$' dsock.h`
+AGE=`egrep '^#define +DSOCK_VERSION_AGE +[0-9]+$' dsock.h`
 
 if [ -z "$CURRENT" -o -z "$REVISION" -o -z "$AGE" ]; then
-    echo "abi_version.sh: error: could not extract version from dillsocks.h" 1>&2
+    echo "abi_version.sh: error: could not extract version from dsock.h" 1>&2
     exit 1
 fi
 

bsock.c

@@ -26,9 +26,9 @@
 
 AC_PREREQ([2.53])
 
-AC_INIT([dillsocks], [m4_esyscmd([./package_version.sh])],
-   [[email protected]], [dillsocks], [http://libdill.org/])
-AC_CONFIG_SRCDIR([dillsocks.pc.in])
+AC_INIT([dsock], [m4_esyscmd([./package_version.sh])],
+   [[email protected]], [dsock], [http://libdill.org/])
+AC_CONFIG_SRCDIR([dsock.pc.in])
 AM_INIT_AUTOMAKE([1.6 foreign subdir-objects tar-ustar])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -41,16 +41,16 @@ AC_CANONICAL_HOST
 AC_PROG_SED
 AC_PROG_AWK
 
-DILLSOCKS_ABI_VERSION=m4_esyscmd([./abi_version.sh])
-DILLSOCKS_PACKAGE_VERSION=m4_esyscmd([./package_version.sh])
-DILLSOCKS_LIBTOOL_VERSION=m4_esyscmd([./abi_version.sh -libtool])
+DSOCK_ABI_VERSION=m4_esyscmd([./abi_version.sh])
+DSOCK_PACKAGE_VERSION=m4_esyscmd([./package_version.sh])
+DSOCK_LIBTOOL_VERSION=m4_esyscmd([./abi_version.sh -libtool])
 
-AC_SUBST(DILLSOCKS_ABI_VERSION)
-AC_SUBST(DILLSOCKS_PACKAGE_VERSION)
-AC_SUBST(DILLSOCKS_LIBTOOL_VERSION)
+AC_SUBST(DSOCK_ABI_VERSION)
+AC_SUBST(DSOCK_PACKAGE_VERSION)
+AC_SUBST(DSOCK_LIBTOOL_VERSION)
 
-AC_MSG_NOTICE([Millsocks package version: $DILLSOCKS_PACKAGE_VERSION])
-AC_MSG_NOTICE([Millsocks ABI version: $DILLSOCKS_ABI_VERSION])
+AC_MSG_NOTICE([Millsocks package version: $DSOCK_PACKAGE_VERSION])
+AC_MSG_NOTICE([Millsocks ABI version: $DSOCK_ABI_VERSION])
 
 ################################################################################
 #  Check the compilers.                                                        #
@@ -93,6 +93,6 @@ LT_INIT
 
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_OUTPUT([Makefile dillsocks.pc])
+AC_OUTPUT([Makefile dsock.pc])
 cp confdefs.h config.h