Hello community,
here is the log from the commit of package librelp for openSUSE:Factory checked
in at 2013-04-24 15:57:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/librelp (Old)
and /work/SRC/openSUSE:Factory/.librelp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librelp", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/librelp/librelp.changes 2012-09-25
10:41:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.librelp.new/librelp.changes 2013-04-24
15:57:17.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Apr 23 20:06:57 UTC 2013 - andreas.stie...@gmx.de
+
+- update to 1.0.3:
+ - added relpCltSetTimeout() interface function
+ - improved timeout handling
+ - provide support for user-settable shutdown indicator
+- includes changes from 1.0.2:
+ - added capability to support only IPv4/v6 instead of both
+
+-------------------------------------------------------------------
Old:
----
librelp-1.0.1.tar.gz
New:
----
librelp-1.0.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ librelp.spec ++++++
--- /var/tmp/diff_new_pack.m9J8xw/_old 2013-04-24 15:57:22.000000000 +0200
+++ /var/tmp/diff_new_pack.m9J8xw/_new 2013-04-24 15:57:22.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package librelp
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: librelp
%define library_name librelp0
-Version: 1.0.1
+Version: 1.0.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.librelp.com/
++++++ librelp-1.0.1.tar.gz -> librelp-1.0.3.tar.gz ++++++
++++ 21313 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/ChangeLog new/librelp-1.0.3/ChangeLog
--- old/librelp-1.0.1/ChangeLog 2012-09-06 17:18:46.000000000 +0200
+++ new/librelp-1.0.3/ChangeLog 2013-04-10 10:57:10.000000000 +0200
@@ -1,4 +1,20 @@
----------------------------------------------------------------------
+Version 1.0.3 (rgerhards), 2013-04-10
+- added relpCltSetTimeout() interface function
+- improved timeout handling
+ Note: default timeout is now consistently 90 seconds (there were
+ some parts of the code where it were 10 seconds and at others
+ they were 180).
+- provide support for user-settable shutdown indicator
+ This was introduced in support of rsyslog, but is probably useful
+ for other users as well. In short, it provides the ability to set
+ a pointer that is expected to be zero as long as the library shall
+ continue to run and set to 1 if it shall terminate. That ptr is then
+ checked at appropriate places of the library code.
+----------------------------------------------------------------------
+Version 1.0.2 (rgerhards), 2013-03-15
+- added capability to support only IPv4/v6 instead of both
+----------------------------------------------------------------------
Version 1.0.1 (rgerhards), 2012-09-06
- added capability to stop server without canceling its thread
- bugfix: interrupt of select() was not properly handled
@@ -6,7 +22,7 @@
execution (and confusing debug messages).
----------------------------------------------------------------------
Version 1.0.0 (rgerhards), 2009-12-11
-This version of librelp matured in practice and it is not time for
+This version of librelp matured in practice and it is now time for
a 1.0 release. Besides that, it includes a small number of
changes:
- bugfix: user callback never received remote IP address
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/INSTALL new/librelp-1.0.3/INSTALL
--- old/librelp-1.0.1/INSTALL 2012-01-19 12:17:42.000000000 +0100
+++ new/librelp-1.0.3/INSTALL 2013-04-07 12:36:30.000000000 +0200
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+ HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved. Use GNU `make'
+instead.
+
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
@@ -304,9 +309,10 @@
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:
+an Autoconf limitation. Until the limitation is lifted, you can use
+this workaround:
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
@@ -362,4 +368,3 @@
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/compile new/librelp-1.0.3/compile
--- old/librelp-1.0.1/compile 2012-01-19 12:17:42.000000000 +0100
+++ new/librelp-1.0.3/compile 2013-04-07 12:36:30.000000000 +0200
@@ -1,10 +1,9 @@
#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
+# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2009-10-06.20; # UTC
+scriptversion=2012-03-05.13; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -29,21 +28,219 @@
# bugs to <bug-autom...@gnu.org> or send patches to
# <automake-patc...@gnu.org>.
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
case $1 in
'')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
+right script to run: please start by reading the file 'INSTALL'.
Report bugs to <bug-autom...@gnu.org>.
EOF
@@ -53,11 +250,13 @@
echo "compile $scriptversion"
exit $?
;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
esac
ofile=
cfile=
-eat=
for arg
do
@@ -66,8 +265,8 @@
else
case $1 in
-o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
@@ -94,10 +293,10 @@
done
if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
+ # If no '-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
+ # '.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
@@ -106,7 +305,7 @@
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
# Create the lock directory.
-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/configure.ac new/librelp-1.0.3/configure.ac
--- old/librelp-1.0.1/configure.ac 2012-07-24 11:44:04.000000000 +0200
+++ new/librelp-1.0.3/configure.ac 2013-04-08 10:05:31.000000000 +0200
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([librelp], [1.0.1], [rgerha...@adiscon.com])
+AC_INIT([librelp], [1.0.3], [rgerha...@adiscon.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/relp.c])
AC_CONFIG_HEADER([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/missing new/librelp-1.0.3/missing
--- old/librelp-1.0.1/missing 2012-01-19 12:17:42.000000000 +0100
+++ new/librelp-1.0.3/missing 2013-04-07 12:36:30.000000000 +0200
@@ -1,10 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.18; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -26,7 +25,7 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
@@ -34,7 +33,7 @@
sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-# In the cases where this matters, `missing' is being run in the
+# In the cases where this matters, 'missing' is being run in the
# srcdir already.
if test -f configure.ac; then
configure_ac=configure.ac
@@ -65,7 +64,7 @@
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
error status if there is no known handling for PROGRAM.
Options:
@@ -74,21 +73,20 @@
--run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
+ aclocal touch file 'aclocal.m4'
+ autoconf touch file 'configure'
+ autoheader touch file 'config.h.in'
autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
+ automake touch all 'Makefile.in' files
+ bison create 'y.tab.[ch]', if possible, from existing .[ch]
+ flex create 'lex.yy.c', if possible, from existing .c
help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
+ lex create 'lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ yacc create 'y.tab.[ch]', if possible, from existing .[ch]
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-autom...@gnu.org>."
exit $?
@@ -100,8 +98,8 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: Unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
@@ -122,22 +120,13 @@
# Not GNU programs, they don't have --version.
;;
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
# Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
+ # running '$TOOL --version' or '$TOOL --help' to check whether
# $TOOL exists and not knowing $TOOL uses missing.
exit 1
fi
@@ -149,27 +138,27 @@
case $program in
aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
+WARNING: '$1' is $msg. You should only need it if
+ you modified 'acinclude.m4' or '${configure_ac}'. You might want
+ to install the Automake and Perl packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
autoconf*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+WARNING: '$1' is $msg. You should only need it if
+ you modified '${configure_ac}'. You might want to install the
+ Autoconf and GNU m4 packages. Grab them from any GNU
archive site."
touch configure
;;
autoheader*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
+WARNING: '$1' is $msg. You should only need it if
+ you modified 'acconfig.h' or '${configure_ac}'. You might want
+ to install the Autoconf and GNU m4 packages. Grab them
from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p'
${configure_ac}`
test -z "$files" && files="config.h"
@@ -186,9 +175,9 @@
automake*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
+WARNING: '$1' is $msg. You should only need it if
+ you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
+ You might want to install the Automake and Perl packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
sed 's/\.am$/.in/' |
@@ -197,10 +186,10 @@
autom4te*)
echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
+WARNING: '$1' is needed, but is $msg.
You might have modified some files without having the
proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
+ You can get '$1' as part of Autoconf from any GNU
archive site."
file=`echo "$*" | sed -n "$sed_output"`
@@ -220,13 +209,13 @@
bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
+WARNING: '$1' $msg. You should only need it if
+ you modified a '.y' file. You may need the Bison package
in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
+ Bison from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -250,13 +239,13 @@
lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
+WARNING: '$1' is $msg. You should only need it if
+ you modified a '.l' file. You may need the Flex package
in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
+ Flex from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -273,10 +262,10 @@
help2man*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: '$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
+ Help2man package in order for those modifications to take
+ effect. You can get Help2man from any GNU archive site."
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@@ -291,12 +280,12 @@
makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
+WARNING: '$1' is $msg. You should only need it if
+ you modified a '.texi' or '.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
+ call might also be the consequence of using a buggy 'make' (AIX,
+ DU, IRIX). You might want to install the Texinfo package or
+ the GNU make package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@@ -318,49 +307,14 @@
touch $file
;;
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
+WARNING: '$1' is needed, and is $msg.
You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
+ proper tools for further handling them. Check the 'README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
+ some other package would contain this missing '$1' program."
exit 1
;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/src/librelp.h new/librelp-1.0.3/src/librelp.h
--- old/librelp-1.0.1/src/librelp.h 2012-07-24 11:44:04.000000000 +0200
+++ new/librelp-1.0.3/src/librelp.h 2013-04-08 18:09:34.000000000 +0200
@@ -141,12 +141,14 @@
/* prototypes needed by library users */
char *relpEngineGetVersion(void); /* use this entry point for configure check
*/
+void relpEngineSetShutdownImmdtPtr(relpEngine_t *pThis, int *ptr);
relpRetVal relpEngineConstruct(relpEngine_t **ppThis);
relpRetVal relpEngineDestruct(relpEngine_t **ppThis);
relpRetVal relpEngineSetDbgprint(relpEngine_t *pThis, void (*dbgprint)(char
*fmt, ...) __attribute__((format(printf, 1, 2))));
relpRetVal relpEngineAddListner(relpEngine_t *pThis, unsigned char *pLstnPort);
relpRetVal relpEngineAddListner2(relpEngine_t *pThis, unsigned char
*pLstnPort, void*);
relpRetVal relpEngineSetStop(relpEngine_t *pThis);
+relpRetVal relpEngineSetFamily(relpEngine_t *pThis, int ai_family);
relpRetVal relpEngineRun(relpEngine_t *pThis);
relpRetVal relpEngineCltDestruct(relpEngine_t *pThis, relpClt_t **ppClt);
relpRetVal relpEngineCltConstruct(relpEngine_t *pThis, relpClt_t **ppClt);
@@ -160,6 +162,7 @@
/* exposed relp client functions */
relpRetVal relpCltConnect(relpClt_t *pThis, int protFamily, unsigned char
*port, unsigned char *host);
relpRetVal relpCltSendSyslog(relpClt_t *pThis, unsigned char *pMsg, size_t
lenMsg);
+relpRetVal relpCltSetTimeout(relpClt_t *pThis, unsigned timeout);
relpRetVal relpCltReconnect(relpClt_t *pThis);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/src/relp.c new/librelp-1.0.3/src/relp.c
--- old/librelp-1.0.1/src/relp.c 2012-07-24 11:44:04.000000000 +0200
+++ new/librelp-1.0.3/src/relp.c 2013-04-08 18:17:03.000000000 +0200
@@ -255,6 +255,7 @@
CHKRet(relpSrvConstruct(&pSrv, pThis));
CHKRet(relpSrvSetUsrPtr(pSrv, pUsr));
CHKRet(relpSrvSetLstnPort(pSrv, pLstnPort));
+ CHKRet(relpSrvSetFamily(pSrv, pThis->ai_family));
CHKRet(relpSrvRun(pSrv));
/* all went well, so we can add the server to our server list */
@@ -297,6 +298,7 @@
RELPOBJ_assert(pThis, Engine);
CHKRet(relpSrvConstruct(&pSrv, pThis));
+ CHKRet(relpSrvSetFamily(pSrv, pThis->ai_family));
CHKRet(relpSrvSetLstnPort(pSrv, pLstnPort));
CHKRet(relpSrvRun(pSrv));
@@ -322,6 +324,17 @@
}
+/* set the socket family to use
+ */
+relpRetVal relpEngineSetFamily(relpEngine_t *pThis, int ai_family)
+{
+ ENTER_RELPFUNC;
+ RELPOBJ_assert(pThis, Engine);
+ pThis->ai_family = ai_family;
+ LEAVE_RELPFUNC;
+}
+
+
/* The "Run" method starts the relp engine. Most importantly, this means the
engine begins
* to read and write data to its peers. This method must be called on its own
thread as it
* will not return until the engine is finished. Note that the engine itself
may (or may
@@ -356,7 +369,7 @@
RELPOBJ_assert(pThis, Engine);
pThis->bStop = 0;
- while(pThis->bStop == 0) {
+ while(!relpEngineShouldStop(pThis)) {
maxfds = 0;
FD_ZERO(&readfds);
FD_ZERO(&writefds);
@@ -391,10 +404,10 @@
}
/* wait for io to become ready */
- if(pThis->bStop) break;
+ if(relpEngineShouldStop(pThis)) break;
nfds = select(maxfds+1, (fd_set *) &readfds, &writefds, NULL,
NULL);
pThis->dbgprint("relp select returns, nfds %d\n", nfds);
- if(pThis->bStop) break;
+ if(relpEngineShouldStop(pThis)) break;
if(nfds == -1) {
if(errno == EINTR) {
@@ -408,7 +421,7 @@
/* and then start again with the servers (new connection
request) */
for(pSrvEtry = pThis->pSrvLstRoot ; pSrvEtry != NULL ; pSrvEtry
= pSrvEtry->pNext) {
for(iSocks = 1 ; iSocks <=
relpSrvGetNumLstnSocks(pSrvEtry->pSrv) ; ++iSocks) {
- if(pThis->bStop) break;
+ if(relpEngineShouldStop(pThis)) break;
sock = relpSrvGetLstnSock(pSrvEtry->pSrv,
iSocks);
if(FD_ISSET(sock, &readfds)) {
pThis->dbgprint("new connect on RELP
socket #%d\n", sock);
@@ -425,7 +438,7 @@
/* now check if we have some action waiting for sessions */
for(pSessEtry = pThis->pSessLstRoot ; pSessEtry != NULL ; ) {
- if(pThis->bStop) break;
+ if(relpEngineShouldStop(pThis)) break;
pSessEtryNext = pSessEtry->pNext; /* we need to cache
this as we may delete the entry! */
sock = relpSessGetSock(pSessEtry->pSess);
/* read data waiting? */
@@ -574,6 +587,13 @@
# endif
}
+void
+relpEngineSetShutdownImmdtPtr(relpEngine_t *pThis, int *ptr)
+{
+ if(pThis->bShutdownImmdt != ptr)
+ pThis->bShutdownImmdt = ptr;
+}
+
/* Enable or disable a command. Note that a command can not be enabled once
* it has been set to forbidden! There will be no error return state in this
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/src/relp.h new/librelp-1.0.3/src/relp.h
--- old/librelp-1.0.1/src/relp.h 2012-07-24 11:44:04.000000000 +0200
+++ new/librelp-1.0.3/src/relp.h 2013-04-08 18:27:42.000000000 +0200
@@ -85,6 +85,7 @@
/* Flags */
int bEnableDns; /**< enabled DNS lookups 0 - no, 1 - yes */
int bAcceptSessFromMalDnsHost; /**< accept session from host with
malicious DNS? (0-no, 1-yes) */
+ int ai_family; /**< to support IPv4/v6 modes */
/* default for enabled commands */
relpCmdEnaState_t stateCmdSyslog;
@@ -102,6 +103,11 @@
pthread_mutex_t mutSessLst;
int bStop; /* set to 1 to stop server after next select */
+ int *bShutdownImmdt; /* if non-NULL provides a kind of "external" */
+ /* bStop functionality. This is in support for rsyslog,
+ * whom's output interface is not capable of calling into
+ * librelp at time of stop request.
+ */
};
@@ -157,6 +163,12 @@
#define relpEngineNextTXNR(txnr) \
((txnr > 999999999) ? 1 : txnr + 1)
+static inline int relpEngineShouldStop(relpEngine_t *pThis) {
+pThis->dbgprint("DDDD: librelp bStop %d, ShutdownImmdt %p, immdet result
%d\n", pThis->bStop, pThis->bShutdownImmdt, (pThis->bShutdownImmdt == NULL) ? 0
: *pThis->bShutdownImmdt);
+ return pThis->bStop
+ || (pThis->bShutdownImmdt != NULL && *pThis->bShutdownImmdt);
+}
+
/* prototypes needed by library itself (rest is in librelp.h) */
relpRetVal relpEngineDispatchFrame(relpEngine_t *pThis, relpSess_t *pSess,
relpFrame_t *pFrame);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/src/relpclt.c new/librelp-1.0.3/src/relpclt.c
--- old/librelp-1.0.1/src/relpclt.c 2011-09-28 09:58:50.000000000 +0200
+++ new/librelp-1.0.3/src/relpclt.c 2013-04-08 11:26:41.000000000 +0200
@@ -1,6 +1,6 @@
/* The relp client.
*
- * Copyright 2008 by Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2008-2013 by Rainer Gerhards and Adiscon GmbH.
*
* This file is part of librelp.
*
@@ -57,6 +57,7 @@
RELP_CORE_CONSTRUCTOR(pThis, Clt);
pThis->pEngine = pEngine;
+ pThis->timeout = 90; /* 90-second timeout is the default */
*ppThis = pThis;
@@ -99,6 +100,7 @@
RELPOBJ_assert(pThis, Clt);
CHKRet(relpSessConstruct(&pThis->pSess, pThis->pEngine, NULL));
+ CHKRet(relpSessSetTimeout(pThis->pSess, pThis->timeout));
CHKRet(relpSessConnect(pThis->pSess, protFamily, port, host));
finalize_it:
@@ -131,6 +133,17 @@
LEAVE_RELPFUNC;
}
+
+/** Set the timeout value for this client.
+ */
+relpRetVal relpCltSetTimeout(relpClt_t *pThis, unsigned timeout)
+{
+ ENTER_RELPFUNC;
+ RELPOBJ_assert(pThis, Clt);
+ pThis->timeout = timeout;
+ LEAVE_RELPFUNC;
+}
+
/* Send a syslog message through RELP. The session must be established.
* The provided message buffer is not touched by this function. The caller
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/src/relpclt.h new/librelp-1.0.3/src/relpclt.h
--- old/librelp-1.0.1/src/relpclt.h 2011-09-28 09:58:50.000000000 +0200
+++ new/librelp-1.0.3/src/relpclt.h 2013-04-08 11:24:10.000000000 +0200
@@ -1,6 +1,6 @@
/* The RELPCLT object.
*
- * Copyright 2008 by Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2008-2013 by Rainer Gerhards and Adiscon GmbH.
*
* This file is part of librelp.
*
@@ -43,6 +43,7 @@
int protFamily; /**< protocol family to connect over (IPv4, v6,
...) */
unsigned char *port; /**< server port to connect to */
unsigned char *host; /**< host(name) to connect to */
+ unsigned timeout; /**< session timeout */
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/src/relpsess.c new/librelp-1.0.3/src/relpsess.c
--- old/librelp-1.0.1/src/relpsess.c 2011-09-28 09:58:50.000000000 +0200
+++ new/librelp-1.0.3/src/relpsess.c 2013-04-09 09:33:12.000000000 +0200
@@ -1,6 +1,6 @@
/* This module implements the relp sess object.
*
- * Copyright 2008 by Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2008-2013 by Rainer Gerhards and Adiscon GmbH.
*
* This file is part of librelp.
*
@@ -73,7 +73,7 @@
pThis->stateCmdSyslog = pEngine->stateCmdSyslog;
pThis->pSrv = pSrv;
pThis->txnr = 1; /* txnr start at 1 according to spec */
- pThis->timeout = 10; /* TODO: make configurable */
+ pThis->timeout = 90;
pThis->sizeWindow = RELP_DFLT_WINDOW_SIZE; /* TODO: make configurable */
pThis->maxDataSize = RELP_DFLT_MAX_DATA_SIZE;
@@ -483,7 +483,7 @@
memcpy(&tTimeout, &tCurr, sizeof(struct timespec));
tTimeout.tv_sec += timeout;
- while(1) {
+ while(!relpEngineShouldStop(pThis->pEngine)) {
sock = relpSessGetSock(pThis);
tvSelect.tv_sec = tTimeout.tv_sec - tCurr.tv_sec;
tvSelect.tv_usec = (tTimeout.tv_nsec - tCurr.tv_nsec) / 1000000;
@@ -497,13 +497,19 @@
FD_ZERO(&readfds);
FD_SET(sock, &readfds);
-pThis->pEngine->dbgprint("relpSessWaitRsp waiting for data on fd %d, timeout
%d.%d\n", sock, (int) tvSelect.tv_sec, (int) tvSelect.tv_usec);
+ pThis->pEngine->dbgprint("relpSessWaitRsp waiting for data on "
+ "fd %d, timeout %d.%d\n", sock, (int) tvSelect.tv_sec,
+ (int) tvSelect.tv_usec);
nfds = select(sock+1, (fd_set *) &readfds, NULL, NULL,
&tvSelect);
-pThis->pEngine->dbgprint("relpSessWaitRsp select returns, nfds %d, errno
%d\n", nfds, errno);
- /* we don't check if we had a timeout - we give it one last
chance */
+ pThis->pEngine->dbgprint("relpSessWaitRsp select returns, "
+ "nfds %d, errno %d\n", nfds, errno);
+ if(relpEngineShouldStop(pThis->pEngine))
+ break;
+ /* we don't check if we had a timeout-we give it one last
chance*/
CHKRet(relpSessRcvData(pThis));
-pThis->pEngine->dbgprint("iRet after relpSessRcvData %d\n", iRet);
- if(pThis->sessState == stateExpected || pThis->sessState ==
eRelpSessState_BROKEN) {
+ pThis->pEngine->dbgprint("iRet after relpSessRcvData %d\n",
iRet);
+ if( pThis->sessState == stateExpected
+ || pThis->sessState == eRelpSessState_BROKEN) {
FINALIZE;
}
@@ -511,8 +517,8 @@
}
finalize_it:
-pThis->pEngine->dbgprint("relpSessWaitState returns %d\n", iRet);
- if(iRet == RELP_RET_TIMED_OUT) {
+ pThis->pEngine->dbgprint("relpSessWaitState returns %d\n", iRet);
+ if(iRet == RELP_RET_TIMED_OUT || relpEngineShouldStop(pThis->pEngine)) {
/* the session is broken! */
pThis->sessState = eRelpSessState_BROKEN;
}
@@ -568,13 +574,11 @@
ENTER_RELPFUNC;
RELPOBJ_assert(pThis, Sess);
- /* this both reads server responses as well as makes sure we have space
left
- * in our window. We provide a nearly eternal timeout (3 minutes). If
we are not
- * ready to send in that period, something is awfully wrong. TODO: we
may want
- * to make this timeout configurable, but I don't think it is a
priority.
+ /* this both reads server responses as well as makes sure we have space
+ * left in our window.
*/
- //CHKRet(relpSessWaitState(pThis, eRelpSessState_READY_TO_SEND, 2));
- CHKRet(relpSessWaitState(pThis, eRelpSessState_READY_TO_SEND, 180));
+ CHKRet(relpSessWaitState(pThis, eRelpSessState_READY_TO_SEND,
+ pThis->timeout));
/* re-try once if automatic retry mode is set */
pThis->pEngine->dbgprint("send command relp sess state %d\n",
pThis->sessState);
@@ -843,6 +847,16 @@
LEAVE_RELPFUNC;
}
+
+relpRetVal
+relpSessSetTimeout(relpSess_t *pThis, unsigned timeout)
+{
+ ENTER_RELPFUNC;
+ RELPOBJ_assert(pThis, Sess);
+ pThis->timeout = timeout;
+ LEAVE_RELPFUNC;
+}
+
/* set the protocol version to be used by this session
* rgerhards, 2008-03-25
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/src/relpsess.h new/librelp-1.0.3/src/relpsess.h
--- old/librelp-1.0.1/src/relpsess.h 2011-09-28 09:58:50.000000000 +0200
+++ new/librelp-1.0.3/src/relpsess.h 2013-04-08 11:24:29.000000000 +0200
@@ -93,7 +93,7 @@
/* properties needed for client operation */
int bAutoRetry; /**< automatically try (once) to reestablish a broken
session? */
int sizeWindow; /**< size of our app-level communications window */
- int timeout; /**< timeout after which session is to be considered
broken */
+ unsigned timeout; /**< timeout after which session is to be considered
broken */
relpSessState_t sessState; /**< state of our session */
/* linked list of frames with outstanding "rsp" */
relpSessUnacked_t *pUnackedLstRoot;
@@ -125,6 +125,7 @@
relpRetVal relpSessGetUnacked(relpSess_t *pThis, relpSendbuf_t **ppSendbuf,
relpTxnr_t txnr);
relpRetVal relpSessTryReestablish(relpSess_t *pThis);
relpRetVal relpSessSetProtocolVersion(relpSess_t *pThis, int protocolVersion);
+relpRetVal relpSessSetTimeout(relpSess_t *pThis, unsigned timeout);
relpRetVal relpSessConstructOffers(relpSess_t *pThis, relpOffers_t **ppOffers);
relpRetVal relpSessSendSyslog(relpSess_t *pThis, unsigned char *pMsg, size_t
lenMsg);
relpRetVal relpSessSetEnableCmd(relpSess_t *pThis, unsigned char *pszCmd,
relpCmdEnaState_t stateCmd);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/src/relpsrv.c new/librelp-1.0.3/src/relpsrv.c
--- old/librelp-1.0.1/src/relpsrv.c 2011-09-28 09:58:50.000000000 +0200
+++ new/librelp-1.0.3/src/relpsrv.c 2013-03-20 10:37:43.000000000 +0100
@@ -33,6 +33,7 @@
#include "config.h"
#include <stdlib.h>
#include <string.h>
+#include <netinet/in.h>
#include <assert.h>
#include "relp.h"
#include "relpsrv.h"
@@ -58,6 +59,7 @@
RELP_CORE_CONSTRUCTOR(pThis, Srv);
pThis->pEngine = pEngine;
pThis->stateCmdSyslog = pEngine->stateCmdSyslog;
+ pThis->ai_family = PF_UNSPEC;
pEngine->dbgprint("relp server %p constructed\n", pThis);
@@ -134,6 +136,19 @@
}
+/* set the IPv4/v6 type to be used. Default is both (PF_UNSPEC)
+ * rgerhards, 2013-03-15
+ */
+relpRetVal
+relpSrvSetFamily(relpSrv_t *pThis, int ai_family)
+{
+ ENTER_RELPFUNC;
+ RELPOBJ_assert(pThis, Srv);
+ pThis->ai_family = ai_family;
+ LEAVE_RELPFUNC;
+}
+
+
/* start a relp server - the server object must have all properties set
* rgerhards, 2008-03-17
*/
@@ -146,7 +161,7 @@
RELPOBJ_assert(pThis, Srv);
CHKRet(relpTcpConstruct(&pTcp, pThis->pEngine));
- CHKRet(relpTcpLstnInit(pTcp, (pThis->pLstnPort == NULL) ? (unsigned
char*) RELP_DFLT_PORT : pThis->pLstnPort));
+ CHKRet(relpTcpLstnInit(pTcp, (pThis->pLstnPort == NULL) ? (unsigned
char*) RELP_DFLT_PORT : pThis->pLstnPort, pThis->ai_family));
pThis->pTcp = pTcp;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/src/relpsrv.h new/librelp-1.0.3/src/relpsrv.h
--- old/librelp-1.0.1/src/relpsrv.h 2011-09-28 09:58:50.000000000 +0200
+++ new/librelp-1.0.3/src/relpsrv.h 2013-03-20 10:37:43.000000000 +0100
@@ -43,6 +43,7 @@
BEGIN_RELP_OBJ;
relpEngine_t *pEngine;
unsigned char *pLstnPort;
+ int ai_family;
relpTcp_t *pTcp; /**< our tcp support object */
size_t maxDataSize; /**< maximum size of a DATA element */
void *pUsr; /**< user pointer (passed back in to callback) */
@@ -60,6 +61,7 @@
relpRetVal relpSrvConstruct(relpSrv_t **ppThis, relpEngine_t *pEngine);
relpRetVal relpSrvDestruct(relpSrv_t **ppThis);
relpRetVal relpSrvSetLstnPort(relpSrv_t *pThis, unsigned char *pLstnPort);
+relpRetVal relpSrvSetFamily(relpSrv_t *pThis, int ai_family);
relpRetVal relpSrvSetUsrPtr(relpSrv_t *pThis, void *pUsr);
relpRetVal relpSrvRun(relpSrv_t *pThis);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/src/tcp.c new/librelp-1.0.3/src/tcp.c
--- old/librelp-1.0.1/src/tcp.c 2011-09-28 09:58:50.000000000 +0200
+++ new/librelp-1.0.3/src/tcp.c 2013-04-07 12:47:07.000000000 +0200
@@ -294,7 +294,7 @@
* gerhards, 2008-03-17
*/
relpRetVal
-relpTcpLstnInit(relpTcp_t *pThis, unsigned char *pLstnPort)
+relpTcpLstnInit(relpTcp_t *pThis, unsigned char *pLstnPort, int ai_family)
{
struct addrinfo hints, *res, *r;
int error, maxs, *s, on = 1;
@@ -310,7 +310,7 @@
memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_PASSIVE;
- hints.ai_family = PF_UNSPEC; /* TODO: permit to configure IPv4/v6
only! */
+ hints.ai_family = ai_family;
hints.ai_socktype = SOCK_STREAM;
error = getaddrinfo(NULL, (char*) pLstnPt, &hints, &res);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/librelp-1.0.1/src/tcp.h new/librelp-1.0.3/src/tcp.h
--- old/librelp-1.0.1/src/tcp.h 2011-09-28 09:58:50.000000000 +0200
+++ new/librelp-1.0.3/src/tcp.h 2013-03-20 10:37:43.000000000 +0100
@@ -58,7 +58,7 @@
relpRetVal relpTcpConstruct(relpTcp_t **ppThis, relpEngine_t *pEngine);
relpRetVal relpTcpDestruct(relpTcp_t **ppThis);
relpRetVal relpTcpAbortDestruct(relpTcp_t **ppThis);
-relpRetVal relpTcpLstnInit(relpTcp_t *pThis, unsigned char *pLstnPort);
+relpRetVal relpTcpLstnInit(relpTcp_t *pThis, unsigned char *pLstnPort, int
ai_family);
relpRetVal relpTcpAcceptConnReq(relpTcp_t **ppThis, int sock, relpEngine_t
*pEngine);
relpRetVal relpTcpRcv(relpTcp_t *pThis, relpOctet_t *pRcvBuf, ssize_t
*pLenBuf);
relpRetVal relpTcpSend(relpTcp_t *pThis, relpOctet_t *pBuf, ssize_t *pLenBuf);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
