[Pkg-silc-commits] r306 - in /silc-client/branches/upstream/current: ./ apps/ apps/irssi/ doc/ includes/ lib/ lib/contrib/ lib/silcapputil/ lib/silcasn1/ lib/silcclient/ lib/silccore/ lib/silccrypt/ lib/silcmath/ lib/silcsftp/ lib/silcske/ lib/silcskr/ lib/silcutil/ lib/silcutil/unix/ lib/silcvcard/
micah at users.alioth.debian.org
micah at users.alioth.debian.org
Tue Oct 7 15:45:31 UTC 2008
Author: micah
Date: Tue Oct 7 15:45:31 2008
New Revision: 306
URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=306
Log:
[svn-upgrade] Integrating new upstream version, silc-client (1.1.5)
Added:
silc-client/branches/upstream/current/ChangeLog
Removed:
silc-client/branches/upstream/current/CHANGES
Modified:
silc-client/branches/upstream/current/Makefile.am
silc-client/branches/upstream/current/Makefile.in
silc-client/branches/upstream/current/apps/Makefile.am
silc-client/branches/upstream/current/apps/Makefile.in
silc-client/branches/upstream/current/apps/irssi/irssi-version.h.in
silc-client/branches/upstream/current/apps/irssi/silc-client.spec
silc-client/branches/upstream/current/configure
silc-client/branches/upstream/current/configure.ac
silc-client/branches/upstream/current/doc/Makefile.am
silc-client/branches/upstream/current/doc/Makefile.in
silc-client/branches/upstream/current/includes/Makefile.am
silc-client/branches/upstream/current/includes/Makefile.in
silc-client/branches/upstream/current/includes/silcdistdefs.h
silc-client/branches/upstream/current/lib/Makefile.am
silc-client/branches/upstream/current/lib/Makefile.in
silc-client/branches/upstream/current/lib/contrib/Makefile.am
silc-client/branches/upstream/current/lib/contrib/Makefile.in
silc-client/branches/upstream/current/lib/silcapputil/Makefile.am
silc-client/branches/upstream/current/lib/silcapputil/Makefile.in
silc-client/branches/upstream/current/lib/silcapputil/silcidcache.c
silc-client/branches/upstream/current/lib/silcasn1/Makefile.am
silc-client/branches/upstream/current/lib/silcasn1/Makefile.in
silc-client/branches/upstream/current/lib/silcclient/Makefile.am
silc-client/branches/upstream/current/lib/silcclient/Makefile.in
silc-client/branches/upstream/current/lib/silcclient/client_channel.c
silc-client/branches/upstream/current/lib/silcclient/client_notify.c
silc-client/branches/upstream/current/lib/silcclient/client_register.c
silc-client/branches/upstream/current/lib/silcclient/command.c
silc-client/branches/upstream/current/lib/silcclient/command_reply.c
silc-client/branches/upstream/current/lib/silccore/Makefile.am
silc-client/branches/upstream/current/lib/silccore/Makefile.in
silc-client/branches/upstream/current/lib/silccore/silcpacket.c
silc-client/branches/upstream/current/lib/silccrypt/Makefile.am
silc-client/branches/upstream/current/lib/silccrypt/Makefile.in
silc-client/branches/upstream/current/lib/silccrypt/aes_x86.asm
silc-client/branches/upstream/current/lib/silccrypt/aes_x86_64.asm
silc-client/branches/upstream/current/lib/silcmath/Makefile.am
silc-client/branches/upstream/current/lib/silcmath/Makefile.in
silc-client/branches/upstream/current/lib/silcsftp/Makefile.am
silc-client/branches/upstream/current/lib/silcsftp/Makefile.in
silc-client/branches/upstream/current/lib/silcske/Makefile.am
silc-client/branches/upstream/current/lib/silcske/Makefile.in
silc-client/branches/upstream/current/lib/silcskr/Makefile.am
silc-client/branches/upstream/current/lib/silcskr/Makefile.in
silc-client/branches/upstream/current/lib/silcskr/silcskr.c
silc-client/branches/upstream/current/lib/silcutil/Makefile.am
silc-client/branches/upstream/current/lib/silcutil/Makefile.in
silc-client/branches/upstream/current/lib/silcutil/silcbuffmt.c
silc-client/branches/upstream/current/lib/silcutil/silcfdstream.c
silc-client/branches/upstream/current/lib/silcutil/silcsocketstream.c
silc-client/branches/upstream/current/lib/silcutil/silcsocketstream_i.h
silc-client/branches/upstream/current/lib/silcutil/silcstack.c
silc-client/branches/upstream/current/lib/silcutil/silcutil.c
silc-client/branches/upstream/current/lib/silcutil/unix/silcunixnet.c
silc-client/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c
silc-client/branches/upstream/current/lib/silcutil/unix/silcunixsocketstream.c
silc-client/branches/upstream/current/lib/silcvcard/Makefile.am
silc-client/branches/upstream/current/lib/silcvcard/Makefile.in
Added: silc-client/branches/upstream/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/ChangeLog?rev=306&op=file
==============================================================================
--- silc-client/branches/upstream/current/ChangeLog (added)
+++ silc-client/branches/upstream/current/ChangeLog Tue Oct 7 15:45:31 2008
@@ -1,0 +1,64 @@
+commit ad10dc073b3684e02f5fa14449463c1122bd4cb2
+Author: Pekka Riikonen <priikone at silcnet.org>
+Date: Sun Aug 31 10:58:11 2008 +0300
+
+ Handle failed memory allocations in packet sending
+
+commit 127c91c66005ddf9585458914e4caaf56758b490
+Author: Pekka Riikonen <priikone at silcnet.org>
+Date: Sun Aug 31 09:58:49 2008 +0300
+
+ silc_stack_free can now be called with NULL stack
+
+commit 103986117eb70b715d462b4d520a1f0912b8f90f
+Author: Pekka Riikonen <priikone at silcnet.org>
+Date: Sat Aug 30 15:08:03 2008 +0300
+
+ Handle EAGAIN and EINTR correctly in silc_get_input in case of error
+
+commit ca4ecaceb517b395f7ca7f74c9333a18e5d39f40
+Author: Pekka Riikonen <priikone at silcnet.org>
+Date: Sat Aug 30 14:15:49 2008 +0300
+
+ Mark client entry invalid when killed and when notified non-existing
+
+commit 136127fe86ff65414e1053c2f23b2126fb91b204
+Author: Pekka Riikonen <priikone at silcnet.org>
+Date: Sat Aug 30 14:14:45 2008 +0300
+
+ Fixed command calling crash
+
+ If command finishes synchronously the command context is not valid
+ anymore and cannot be accessed. Reported by Sami Farin.
+
+commit 9263a12746fef57cf369e6830431e85d730c8701
+Author: Pekka Riikonen <priikone at silcnet.org>
+Date: Sat Aug 30 14:12:33 2008 +0300
+
+ Changed packet_error structure const correctly
+
+commit 68778effadb54cc42d8da50a30b97e12738415bd
+Author: Pekka Riikonen <priikone at silcnet.org>
+Date: Sat Aug 30 14:12:00 2008 +0300
+
+ Fixed resuming to work even when there are no joined channels
+
+commit 200cf7d05f4f9d46ce0ec08b906f988fd19747ee
+Author: Pekka Riikonen <priikone at silcnet.org>
+Date: Sat Aug 30 14:10:45 2008 +0300
+
+ Fixed channel private key deleting to restore original keys correctly
+
+commit 434015aa9a1ffc492116af219eba09e36188cbf9
+Author: Pekka Riikonen <priikone at silcnet.org>
+Date: Sat Aug 30 10:50:24 2008 +0300
+
+ Resolve channel in INVITE notify if we don't have it yet
+
+ Fixes bug that user cannot se INVITE notifications sent by other users.
+
+commit 4d26d9f598384d7cd49c6238ea4a81b9f4e6f212
+Author: Pekka Riikonen <priikone at silcnet.org>
+Date: Sun Jun 22 17:42:40 2008 +0300
+
+ Remove client from expired client list before deleting it
Modified: silc-client/branches/upstream/current/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/Makefile.am (original)
+++ silc-client/branches/upstream/current/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./Makefile.ad file in the source tree.
# Source: ./Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:38 EEST 2008 by priikone
# Distribution: Client
# License:
@@ -27,7 +27,7 @@
SUBDIRS = @LIBSUBDIR@ apps includes doc
-EXTRA_DIST = silcdefs.h.in README.PLUGIN libtoolfix CHANGES CREDITS
+EXTRA_DIST = silcdefs.h.in README.PLUGIN libtoolfix CREDITS
include $(top_srcdir)/Makefile.defines.in
Modified: silc-client/branches/upstream/current/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/Makefile.in (original)
+++ silc-client/branches/upstream/current/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./Makefile.ad file in the source tree.
# Source: ./Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:38 EEST 2008 by priikone
# Distribution: Client
# License:
@@ -100,8 +100,9 @@
$(srcdir)/silcdefs.h.in $(top_srcdir)/Makefile.defines.in \
$(top_srcdir)/apps/irssi/Makefile.defines.in \
$(top_srcdir)/apps/irssi/Makefile.defines_int.in \
- $(top_srcdir)/configure COPYING INSTALL TODO config.guess \
- config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
+ $(top_srcdir)/configure COPYING ChangeLog INSTALL TODO \
+ config.guess config.sub depcomp install-sh ltmain.sh missing \
+ mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -295,7 +296,7 @@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
SUBDIRS = @LIBSUBDIR@ apps includes doc
-EXTRA_DIST = silcdefs.h.in README.PLUGIN libtoolfix CHANGES CREDITS
+EXTRA_DIST = silcdefs.h.in README.PLUGIN libtoolfix CREDITS
#
# INCLUDE defines
Modified: silc-client/branches/upstream/current/apps/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/apps/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/apps/Makefile.am (original)
+++ silc-client/branches/upstream/current/apps/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./apps/Makefile.ad file in the source tree.
# Source: ./apps/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/apps/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/apps/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/apps/Makefile.in (original)
+++ silc-client/branches/upstream/current/apps/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./apps/Makefile.ad file in the source tree.
# Source: ./apps/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/apps/irssi/irssi-version.h.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/apps/irssi/irssi-version.h.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/apps/irssi/irssi-version.h.in (original)
+++ silc-client/branches/upstream/current/apps/irssi/irssi-version.h.in Tue Oct 7 15:45:31 2008
@@ -1,4 +1,4 @@
/* automatically created by autogen.sh */
-#define IRSSI_VERSION "1.1.4 (Irssi base: @VERSION@ - SILC base: SILC 1.1.4)"
-#define IRSSI_VERSION_DATE 20080320
-#define IRSSI_VERSION_TIME 20080320
+#define IRSSI_VERSION "1.1.5 (Irssi base: @VERSION@ - SILC base: SILC 1.1.5)"
+#define IRSSI_VERSION_DATE 20080906
+#define IRSSI_VERSION_TIME 20080906
Modified: silc-client/branches/upstream/current/apps/irssi/silc-client.spec
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/apps/irssi/silc-client.spec?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/apps/irssi/silc-client.spec (original)
+++ silc-client/branches/upstream/current/apps/irssi/silc-client.spec Tue Oct 7 15:45:31 2008
@@ -1,6 +1,6 @@
Summary: SILC Client
Name: silc-client
-Version: 1.1.4
+Version: 1.1.5
Release: 0.fc8
License: GPL
Group: Applications/Communications
Modified: silc-client/branches/upstream/current/configure
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/configure?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/configure (original)
+++ silc-client/branches/upstream/current/configure Tue Oct 7 15:45:31 2008
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Client 1.1.4.
+# Generated by GNU Autoconf 2.61 for Client 1.1.5.
#
# Report bugs to <silc-devel at lists.silcnet.org>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='Client'
PACKAGE_TARNAME='silc-client'
-PACKAGE_VERSION='1.1.4'
-PACKAGE_STRING='Client 1.1.4'
+PACKAGE_VERSION='1.1.5'
+PACKAGE_STRING='Client 1.1.5'
PACKAGE_BUGREPORT='silc-devel at lists.silcnet.org'
# Factoring default headers for most tests.
@@ -1480,7 +1480,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Client 1.1.4 to adapt to many kinds of systems.
+\`configure' configures Client 1.1.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1551,7 +1551,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Client 1.1.4:";;
+ short | recursive ) echo "Configuration of Client 1.1.5:";;
esac
cat <<\_ACEOF
@@ -1679,7 +1679,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Client configure 1.1.4
+Client configure 1.1.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1693,7 +1693,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Client $as_me 1.1.4, which was
+It was created by Client $as_me 1.1.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2509,7 +2509,7 @@
# Define the identity of the package.
PACKAGE='silc-client'
- VERSION='1.1.4'
+ VERSION='1.1.5'
cat >>confdefs.h <<_ACEOF
@@ -31830,7 +31830,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Client $as_me 1.1.4, which was
+This file was extended by Client $as_me 1.1.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -31883,7 +31883,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Client config.status 1.1.4
+Client config.status 1.1.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: silc-client/branches/upstream/current/configure.ac
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/configure.ac?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/configure.ac (original)
+++ silc-client/branches/upstream/current/configure.ac Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the configure.ad file in the source tree.
# Source: configure.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
@@ -23,7 +23,7 @@
# GNU General Public License for more details.
#
-AC_INIT([Client], [1.1.4], [silc-devel at lists.silcnet.org], [silc-client])
+AC_INIT([Client], [1.1.5], [silc-devel at lists.silcnet.org], [silc-client])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE
AC_PREREQ(2.52)
Modified: silc-client/branches/upstream/current/doc/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/doc/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/doc/Makefile.am (original)
+++ silc-client/branches/upstream/current/doc/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./doc/Makefile.ad file in the source tree.
# Source: ./doc/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/doc/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/doc/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/doc/Makefile.in (original)
+++ silc-client/branches/upstream/current/doc/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./doc/Makefile.ad file in the source tree.
# Source: ./doc/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/includes/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/includes/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/includes/Makefile.am (original)
+++ silc-client/branches/upstream/current/includes/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./includes/Makefile.ad file in the source tree.
# Source: ./includes/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/includes/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/includes/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/includes/Makefile.in (original)
+++ silc-client/branches/upstream/current/includes/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./includes/Makefile.ad file in the source tree.
# Source: ./includes/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/includes/silcdistdefs.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/includes/silcdistdefs.h?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/includes/silcdistdefs.h (original)
+++ silc-client/branches/upstream/current/includes/silcdistdefs.h Tue Oct 7 15:45:31 2008
@@ -1,7 +1,7 @@
/*
Automatically generated by Autodist 1.4. Do not edit.
- Generated: Thu Mar 20 08:44:55 EET 2008 by priikone
+ Generated: Sat Sep 6 15:20:15 EEST 2008 by priikone
Distribution: Client
License:
*/
Modified: silc-client/branches/upstream/current/lib/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/Makefile.ad file in the source tree.
# Source: ./lib/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/Makefile.ad file in the source tree.
# Source: ./lib/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/contrib/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/contrib/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/contrib/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/contrib/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/contrib/Makefile.ad file in the source tree.
# Source: ./lib/contrib/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/contrib/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/contrib/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/contrib/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/contrib/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/contrib/Makefile.ad file in the source tree.
# Source: ./lib/contrib/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcapputil/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcapputil/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcapputil/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcapputil/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcapputil/Makefile.ad file in the source tree.
# Source: ./lib/silcapputil/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcapputil/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcapputil/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcapputil/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcapputil/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/silcapputil/Makefile.ad file in the source tree.
# Source: ./lib/silcapputil/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcapputil/silcidcache.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcapputil/silcidcache.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcapputil/silcidcache.c (original)
+++ silc-client/branches/upstream/current/lib/silcapputil/silcidcache.c Tue Oct 7 15:45:31 2008
@@ -142,9 +142,8 @@
if (id) {
/* See if this entry is added already to cache */
if (silc_idcache_find_by_id_one(cache, id, NULL)) {
- SILC_LOG_ERROR(("Attempted to add same ID twice to ID Cache, id %s",
+ SILC_LOG_DEBUG(("Attempted to add same ID twice to ID Cache, id %s",
silc_id_render(id, cache->id_type)));
- SILC_ASSERT(FALSE);
goto err;
}
}
Modified: silc-client/branches/upstream/current/lib/silcasn1/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcasn1/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcasn1/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcasn1/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcasn1/Makefile.ad file in the source tree.
# Source: ./lib/silcasn1/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcasn1/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcasn1/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcasn1/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcasn1/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/silcasn1/Makefile.ad file in the source tree.
# Source: ./lib/silcasn1/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcclient/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcclient/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcclient/Makefile.ad file in the source tree.
# Source: ./lib/silcclient/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcclient/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcclient/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/silcclient/Makefile.ad file in the source tree.
# Source: ./lib/silcclient/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcclient/client_channel.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/client_channel.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/client_channel.c (original)
+++ silc-client/branches/upstream/current/lib/silcclient/client_channel.c Tue Oct 7 15:45:31 2008
@@ -626,8 +626,14 @@
}
channel->internal.curr_key = NULL;
- channel->cipher = silc_cipher_get_name(channel->internal.send_key);
- channel->hmac = silc_hmac_get_name(channel->internal.hmac);
+ if (channel->internal.send_key)
+ channel->cipher = silc_cipher_get_name(channel->internal.send_key);
+ else
+ channel->cipher = NULL;
+ if (channel->hmac)
+ channel->hmac = silc_hmac_get_name(channel->internal.hmac);
+ else
+ channel->hmac = NULL;
silc_dlist_uninit(channel->internal.private_keys);
channel->internal.private_keys = NULL;
Modified: silc-client/branches/upstream/current/lib/silcclient/client_notify.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/client_notify.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/client_notify.c (original)
+++ silc-client/branches/upstream/current/lib/silcclient/client_notify.c Tue Oct 7 15:45:31 2008
@@ -4,7 +4,7 @@
Author: Pekka Riikonen <priikone at silcnet.org>
- Copyright (C) 1997 - 2007 Pekka Riikonen
+ Copyright (C) 1997 - 2008 Pekka Riikonen
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
@@ -298,8 +298,14 @@
/* Get the channel entry */
channel = silc_client_get_channel_by_id(client, conn, &id.u.channel_id);
- if (!channel)
- goto out;
+ if (!channel) {
+ /** Resolve channel */
+ SILC_FSM_CALL(silc_client_get_channel_by_id_resolve(
+ client, conn, &id.u.channel_id,
+ silc_client_notify_resolved,
+ notify));
+ /* NOT REACHED */
+ }
/* If channel is being resolved handle notify after resolving */
if (channel->internal.resolve_cmd_ident) {
@@ -529,7 +535,7 @@
if (tmp && tmp_len > 128)
tmp[128] = '\0';
- if (packet->dst_id_type == SILC_ID_CHANNEL)
+ if (packet->dst_id_type == SILC_ID_CHANNEL)
if (silc_id_str2id(packet->dst_id, packet->dst_id_len, SILC_ID_CHANNEL,
&id.u.channel_id, sizeof(id.u.channel_id)))
channel = silc_client_get_channel_by_id(client, conn, &id.u.channel_id);
Modified: silc-client/branches/upstream/current/lib/silcclient/client_register.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/client_register.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/client_register.c (original)
+++ silc-client/branches/upstream/current/lib/silcclient/client_register.c Tue Oct 7 15:45:31 2008
@@ -563,25 +563,26 @@
&conn->local_entry->id);
/* Call JOIN command replies for all joined channel */
- silc_idcache_get_all(conn->internal->channel_cache, &channels);
- silc_list_start(channels);
- while ((entry = silc_list_get(channels))) {
- SilcHashTableList htl;
- const char *cipher, *hmac;
-
- channel = entry->context;
- cipher = (channel->internal.send_key ?
- silc_cipher_get_name(channel->internal.send_key) : NULL);
- hmac = (channel->internal.hmac ?
- silc_hmac_get_name(channel->internal.hmac) : NULL);
- silc_hash_table_list(channel->user_list, &htl);
- silc_client_resume_command_callback(client, conn, SILC_COMMAND_JOIN,
- channel->channel_name, channel,
- channel->mode, &htl, channel->topic,
- cipher, hmac, channel->founder_key,
- channel->channel_pubkeys,
- channel->user_limit);
- silc_hash_table_list_reset(&htl);
+ if (silc_idcache_get_all(conn->internal->channel_cache, &channels)) {
+ silc_list_start(channels);
+ while ((entry = silc_list_get(channels))) {
+ SilcHashTableList htl;
+ const char *cipher, *hmac;
+
+ channel = entry->context;
+ cipher = (channel->internal.send_key ?
+ silc_cipher_get_name(channel->internal.send_key) : NULL);
+ hmac = (channel->internal.hmac ?
+ silc_hmac_get_name(channel->internal.hmac) : NULL);
+ silc_hash_table_list(channel->user_list, &htl);
+ silc_client_resume_command_callback(client, conn, SILC_COMMAND_JOIN,
+ channel->channel_name, channel,
+ channel->mode, &htl, channel->topic,
+ cipher, hmac, channel->founder_key,
+ channel->channel_pubkeys,
+ channel->user_limit);
+ silc_hash_table_list_reset(&htl);
+ }
}
conn->internal->registering = FALSE;
Modified: silc-client/branches/upstream/current/lib/silcclient/command.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/command.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/command.c (original)
+++ silc-client/branches/upstream/current/lib/silcclient/command.c Tue Oct 7 15:45:31 2008
@@ -411,6 +411,7 @@
SilcUInt32 argc = 0;
unsigned char **argv = NULL;
SilcUInt32 *argv_lens = NULL, *argv_types = NULL;
+ SilcUInt16 cmd_ident;
SilcClientCommand command;
SilcClientCommandContext cmd;
char *arg;
@@ -480,7 +481,7 @@
cmd->argv = argv;
cmd->argv_lens = argv_lens;
cmd->argv_types = argv_types;
- cmd->cmd_ident = silc_client_cmd_ident(conn);
+ cmd_ident = cmd->cmd_ident = silc_client_cmd_ident(conn);
cmd->called = TRUE;
cmd->verbose = TRUE;
silc_list_init(cmd->reply_callbacks,
@@ -492,7 +493,7 @@
silc_client_command_destructor, NULL, FALSE);
silc_fsm_start_sync(&cmd->thread, command->command);
- return cmd->cmd_ident;
+ return cmd_ident;
}
/* Generic function to send any command. The arguments must be sent already
Modified: silc-client/branches/upstream/current/lib/silcclient/command_reply.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcclient/command_reply.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcclient/command_reply.c (original)
+++ silc-client/branches/upstream/current/lib/silcclient/command_reply.c Tue Oct 7 15:45:31 2008
@@ -118,6 +118,7 @@
client_entry = silc_client_get_client_by_id(client, conn, &id.u.client_id);
if (client_entry) {
silc_client_remove_from_channels(client, conn, client_entry);
+ client_entry->internal.valid = FALSE;
silc_client_del_client(client, conn, client_entry);
silc_client_unref_client(client, conn, client_entry);
}
@@ -947,6 +948,7 @@
/* Remove the client */
if (client_entry) {
silc_client_remove_from_channels(client, conn, client_entry);
+ client_entry->internal.valid = FALSE;
silc_client_del_client(client, conn, client_entry);
silc_client_unref_client(client, conn, client_entry);
}
Modified: silc-client/branches/upstream/current/lib/silccore/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccore/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccore/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silccore/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silccore/Makefile.ad file in the source tree.
# Source: ./lib/silccore/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silccore/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccore/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccore/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silccore/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/silccore/Makefile.ad file in the source tree.
# Source: ./lib/silccore/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silccore/silcpacket.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccore/silcpacket.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccore/silcpacket.c (original)
+++ silc-client/branches/upstream/current/lib/silccore/silcpacket.c Tue Oct 7 15:45:31 2008
@@ -4,7 +4,7 @@
Author: Pekka Riikonen <priikone at silcnet.org>
- Copyright (C) 1997 - 2007 Pekka Riikonen
+ Copyright (C) 1997 - 2008 Pekka Riikonen
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
@@ -336,7 +336,6 @@
silc_mutex_unlock(ps->lock);
if (ret == -1) {
/* Cannot read now, do it later. */
- silc_buffer_pull(inbuf, silc_buffer_len(inbuf));
return FALSE;
}
@@ -394,7 +393,6 @@
if (ret == -1) {
/* Cannot read now, do it later. */
- silc_buffer_pull(inbuf, silc_buffer_len(inbuf));
return FALSE;
}
@@ -623,7 +621,7 @@
silc_free(engine);
}
-static const char *packet_error[] = {
+static const char * const packet_error[] = {
"Cannot read from stream",
"Cannot write to stream",
"Packet MAC failed",
@@ -723,8 +721,8 @@
(void *)&ps->sc)) {
ps->sc = silc_calloc(1, sizeof(*ps->sc));
if (!ps->sc) {
+ silc_mutex_unlock(engine->lock);
silc_packet_stream_destroy(ps);
- silc_mutex_unlock(engine->lock);
return NULL;
}
ps->sc->engine = engine;
@@ -735,8 +733,8 @@
if (!inbuf) {
silc_free(ps->sc);
ps->sc = NULL;
+ silc_mutex_unlock(engine->lock);
silc_packet_stream_destroy(ps);
- silc_mutex_unlock(engine->lock);
return NULL;
}
silc_buffer_reset(inbuf);
@@ -746,8 +744,8 @@
silc_buffer_free(inbuf);
silc_free(ps->sc);
ps->sc = NULL;
+ silc_mutex_unlock(engine->lock);
silc_packet_stream_destroy(ps);
- silc_mutex_unlock(engine->lock);
return NULL;
}
silc_dlist_add(ps->sc->inbufs, inbuf);
@@ -758,8 +756,8 @@
silc_dlist_del(ps->sc->inbufs, inbuf);
silc_free(ps->sc);
ps->sc = NULL;
+ silc_mutex_unlock(engine->lock);
silc_packet_stream_destroy(ps);
- silc_mutex_unlock(engine->lock);
return NULL;
}
}
@@ -887,6 +885,8 @@
return;
if (silc_atomic_sub_int8(&stream->refcnt, 1) > 0) {
+ if (stream->destroyed)
+ return;
stream->destroyed = TRUE;
SILC_LOG_DEBUG(("Marking packet stream %p destroyed", stream));
@@ -901,17 +901,18 @@
if (!stream->udp) {
/* Delete from engine */
- engine = stream->sc->engine;
- silc_mutex_lock(engine->lock);
- silc_list_del(engine->streams, stream);
-
- /* Remove per scheduler context, if it is not used anymore */
if (stream->sc) {
+ engine = stream->sc->engine;
+ silc_mutex_lock(engine->lock);
+ silc_list_del(engine->streams, stream);
+
+ /* Remove per scheduler context, if it is not used anymore */
stream->sc->stream_count--;
if (!stream->sc->stream_count)
silc_hash_table_del(engine->contexts, stream->sc->schedule);
- }
- silc_mutex_unlock(engine->lock);
+
+ silc_mutex_unlock(engine->lock);
+ }
/* Destroy the underlaying stream */
if (stream->stream)
Modified: silc-client/branches/upstream/current/lib/silccrypt/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccrypt/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccrypt/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silccrypt/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silccrypt/Makefile.ad file in the source tree.
# Source: ./lib/silccrypt/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silccrypt/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccrypt/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccrypt/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silccrypt/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/silccrypt/Makefile.ad file in the source tree.
# Source: ./lib/silccrypt/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silccrypt/aes_x86.asm
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccrypt/aes_x86.asm?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccrypt/aes_x86.asm (original)
+++ silc-client/branches/upstream/current/lib/silccrypt/aes_x86.asm Tue Oct 7 15:45:31 2008
@@ -595,3 +595,7 @@
%endif
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
Modified: silc-client/branches/upstream/current/lib/silccrypt/aes_x86_64.asm
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silccrypt/aes_x86_64.asm?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silccrypt/aes_x86_64.asm (original)
+++ silc-client/branches/upstream/current/lib/silccrypt/aes_x86_64.asm Tue Oct 7 15:45:31 2008
@@ -864,3 +864,7 @@
%endif
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
Modified: silc-client/branches/upstream/current/lib/silcmath/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcmath/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcmath/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcmath/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcmath/Makefile.ad file in the source tree.
# Source: ./lib/silcmath/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcmath/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcmath/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcmath/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcmath/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/silcmath/Makefile.ad file in the source tree.
# Source: ./lib/silcmath/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcsftp/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcsftp/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcsftp/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcsftp/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcsftp/Makefile.ad file in the source tree.
# Source: ./lib/silcsftp/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcsftp/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcsftp/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcsftp/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcsftp/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/silcsftp/Makefile.ad file in the source tree.
# Source: ./lib/silcsftp/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcske/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcske/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcske/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcske/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcske/Makefile.ad file in the source tree.
# Source: ./lib/silcske/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcske/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcske/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcske/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcske/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/silcske/Makefile.ad file in the source tree.
# Source: ./lib/silcske/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcskr/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcskr/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcskr/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcskr/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcskr/Makefile.ad file in the source tree.
# Source: ./lib/silcskr/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcskr/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcskr/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcskr/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcskr/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/silcskr/Makefile.ad file in the source tree.
# Source: ./lib/silcskr/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcskr/silcskr.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcskr/silcskr.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcskr/silcskr.c (original)
+++ silc-client/branches/upstream/current/lib/silcskr/silcskr.c Tue Oct 7 15:45:31 2008
@@ -632,8 +632,7 @@
SilcBool silc_skr_init(SilcSKR skr)
{
- if (!silc_mutex_alloc(&skr->lock))
- return FALSE;
+ silc_mutex_alloc(&skr->lock);
skr->keys = silc_hash_table_alloc(0, silc_skr_hash, NULL,
silc_skr_compare, NULL,
Modified: silc-client/branches/upstream/current/lib/silcutil/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcutil/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcutil/Makefile.ad file in the source tree.
# Source: ./lib/silcutil/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcutil/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcutil/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/silcutil/Makefile.ad file in the source tree.
# Source: ./lib/silcutil/Makefile.ad
-# Generated: Thu Mar 20 08:45:13 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:40 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcutil/silcbuffmt.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/silcbuffmt.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/silcbuffmt.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/silcbuffmt.c Tue Oct 7 15:45:31 2008
@@ -365,7 +365,8 @@
UNFORMAT_HAS_SPACE(src, len2);
if (silc_likely(len2 && x)) {
*x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char));
- memcpy(*x, src->data, len2);
+ if (*x)
+ memcpy(*x, src->data, len2);
}
silc_buffer_pull(src, len2);
break;
@@ -478,7 +479,8 @@
UNFORMAT_HAS_SPACE(src, len2);
if (silc_likely(x && len2)) {
*x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char));
- memcpy(*x, src->data, len2);
+ if (*x)
+ memcpy(*x, src->data, len2);
}
silc_buffer_pull(src, len2);
break;
@@ -493,7 +495,8 @@
UNFORMAT_HAS_SPACE(src, len2);
if (silc_likely(x && len2)) {
*x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char));
- memcpy(*x, src->data, len2);
+ if (*x)
+ memcpy(*x, src->data, len2);
}
silc_buffer_pull(src, len2);
break;
@@ -521,7 +524,8 @@
UNFORMAT_HAS_SPACE(src, len2);
if (silc_likely(x && len2)) {
*x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char));
- memcpy(*x, src->data, len2);
+ if (*x)
+ memcpy(*x, src->data, len2);
}
silc_buffer_pull(src, len2);
break;
@@ -571,7 +575,8 @@
*len3 = len2;
if (x && len2) {
*x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char));
- memcpy(*x, src->data, len2);
+ if (*x)
+ memcpy(*x, src->data, len2);
}
silc_buffer_pull(src, len2);
break;
@@ -589,7 +594,8 @@
*len3 = len2;
if (x && len2) {
*x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char));
- memcpy(*x, src->data, len2);
+ if (*x)
+ memcpy(*x, src->data, len2);
}
silc_buffer_pull(src, len2);
break;
@@ -630,9 +636,10 @@
SILC_GET32_MSB(len2, src->data);
silc_buffer_pull(src, 4);
UNFORMAT_HAS_SPACE(src, len2);
- silc_buffer_sformat(stack, x,
- SILC_STR_DATA(src->data, len2),
- SILC_STR_END);
+ if (silc_buffer_sformat(stack, x,
+ SILC_STR_DATA(src->data, len2),
+ SILC_STR_END) < 0)
+ goto fail;
silc_buffer_pull(src, len2);
}
break;
Modified: silc-client/branches/upstream/current/lib/silcutil/silcfdstream.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/silcfdstream.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/silcfdstream.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/silcfdstream.c Tue Oct 7 15:45:31 2008
@@ -4,7 +4,7 @@
Author: Pekka Riikonen <priikone at silcnet.org>
- Copyright (C) 2005 - 2007 Pekka Riikonen
+ Copyright (C) 2005 - 2008 Pekka Riikonen
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
@@ -21,7 +21,7 @@
/************************** Types and definitions ***************************/
-#define SILC_IS_FD_STREAM(s) (s->ops == &silc_fd_stream_ops)
+#define SILC_IS_FD_STREAM(s) (s && s->ops == &silc_fd_stream_ops)
const SilcStreamOps silc_fd_stream_ops;
Modified: silc-client/branches/upstream/current/lib/silcutil/silcsocketstream.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/silcsocketstream.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/silcsocketstream.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/silcsocketstream.c Tue Oct 7 15:45:31 2008
@@ -4,7 +4,7 @@
Author: Pekka Riikonen <priikone at silcnet.org>
- Copyright (C) 2005 - 2007 Pekka Riikonen
+ Copyright (C) 2005 - 2008 Pekka Riikonen
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
@@ -350,6 +350,7 @@
!limit_sec && !limit_usec) {
silc_schedule_task_del_by_context(socket_stream->schedule,
socket_stream->qos);
+ silc_free(socket_stream->qos->buffer);
silc_free(socket_stream->qos);
socket_stream->qos = NULL;
return TRUE;
@@ -370,7 +371,8 @@
socket_stream->qos->cur_rate = 0;
socket_stream->qos->sock = socket_stream;
- socket_stream->qos->buffer = silc_malloc(read_limit_bytes);
+ socket_stream->qos->buffer = silc_realloc(socket_stream->qos->buffer,
+ read_limit_bytes);
if (!socket_stream->qos->buffer)
return FALSE;
Modified: silc-client/branches/upstream/current/lib/silcutil/silcsocketstream_i.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/silcsocketstream_i.h?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/silcsocketstream_i.h (original)
+++ silc-client/branches/upstream/current/lib/silcutil/silcsocketstream_i.h Tue Oct 7 15:45:31 2008
@@ -4,7 +4,7 @@
Author: Pekka Riikonen <priikone at silcnet.org>
- Copyright (C) 2005 - 2006 Pekka Riikonen
+ Copyright (C) 2005 - 2008 Pekka Riikonen
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
@@ -56,8 +56,8 @@
unsigned int connected : 1; /* UDP connected state */
};
-#define SILC_IS_SOCKET_STREAM(s) (s->ops == &silc_socket_stream_ops)
-#define SILC_IS_SOCKET_STREAM_UDP(s) (s->ops == &silc_socket_udp_stream_ops)
+#define SILC_IS_SOCKET_STREAM(s) (s && s->ops == &silc_socket_stream_ops)
+#define SILC_IS_SOCKET_STREAM_UDP(s) (s && s->ops == &silc_socket_udp_stream_ops)
extern const SilcStreamOps silc_socket_stream_ops;
extern const SilcStreamOps silc_socket_udp_stream_ops;
Modified: silc-client/branches/upstream/current/lib/silcutil/silcstack.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/silcstack.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/silcstack.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/silcstack.c Tue Oct 7 15:45:31 2008
@@ -4,7 +4,7 @@
Author: Pekka Riikonen <priikone at silcnet.org>
- Copyright (C) 2003 - 2006 Pekka Riikonen
+ Copyright (C) 2003 - 2008 Pekka Riikonen
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
@@ -65,6 +65,9 @@
void silc_stack_free(SilcStack stack)
{
int i;
+
+ if (!stack)
+ return;
silc_free(stack->frames);
for (i = 0; i < SILC_STACK_BLOCK_NUM; i++)
Modified: silc-client/branches/upstream/current/lib/silcutil/silcutil.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/silcutil.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/silcutil.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/silcutil.c Tue Oct 7 15:45:31 2008
@@ -119,8 +119,10 @@
if (!user && !fqdn)
return 0;
- memset(user, 0, user_size);
- memset(fqdn, 0, fqdn_size);
+ if (user)
+ memset(user, 0, user_size);
+ if (user)
+ memset(fqdn, 0, fqdn_size);
if (!string)
return 0;
@@ -469,7 +471,7 @@
{
unsigned char *fingerprint, *cp;
unsigned int len, blocks, i;
-
+
if (!data || !data_len)
return NULL;
@@ -484,7 +486,7 @@
cp = fingerprint = silc_calloc(len, sizeof(*fingerprint));
if (!cp)
return NULL;
-
+
for (i = 0; i < data_len; i++) {
silc_snprintf(cp, len, "%02X", data[i]);
cp += 2;
@@ -497,7 +499,7 @@
}
i--;
if ((i + 1) % 10 == 0)
- *(--cp) = '\0';
+ *(--cp) = '\0';
if ((i + 1) % 2 == 0)
*(--cp) = '\0';
@@ -555,13 +557,18 @@
printf("%s", prompt);
fflush(stdout);
+ read_again1:
if ((read(fd, input, sizeof(input))) < 0) {
+ if (errno == EAGAIN || errno == EINTR)
+ goto read_again1;
fprintf(stderr, "silc: %s\n", strerror(errno));
+ signal(SIGINT, SIG_DFL);
tcsetattr(fd, TCSANOW, &to_old);
return NULL;
}
if (strlen(input) <= 1) {
+ signal(SIGINT, SIG_DFL);
tcsetattr(fd, TCSANOW, &to_old);
return NULL;
}
@@ -589,10 +596,18 @@
printf("%s", prompt);
fflush(stdout);
+ signal(SIGINT, SIG_IGN);
+
+ read_again2:
if ((read(fd, input, sizeof(input))) < 0) {
+ if (errno == EAGAIN || errno == EINTR)
+ goto read_again2;
fprintf(stderr, "silc: %s\n", strerror(errno));
+ signal(SIGINT, SIG_DFL);
return NULL;
}
+
+ signal(SIGINT, SIG_DFL);
if (strlen(input) <= 1)
return NULL;
Modified: silc-client/branches/upstream/current/lib/silcutil/unix/silcunixnet.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/unix/silcunixnet.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/unix/silcunixnet.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/unix/silcunixnet.c Tue Oct 7 15:45:31 2008
@@ -701,6 +701,9 @@
silc_async_free(conn->op);
}
+ if (conn->sock && conn->status != SILC_NET_OK)
+ silc_net_close_connection(conn->sock);
+
return SILC_FSM_FINISH;
}
Modified: silc-client/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/unix/silcunixschedule.c Tue Oct 7 15:45:31 2008
@@ -4,7 +4,7 @@
Author: Pekka Riikonen <priikone at silcnet.org>
- Copyright (C) 1998 - 2007 Pekka Riikonen
+ Copyright (C) 1998 - 2008 Pekka Riikonen
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
@@ -288,6 +288,7 @@
SILC_LOG_DEBUG(("epoll_ctl (DEL): %s", strerror(errno)));
return FALSE;
}
+ task->scheduled = FALSE;
return TRUE;
}
Modified: silc-client/branches/upstream/current/lib/silcutil/unix/silcunixsocketstream.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcutil/unix/silcunixsocketstream.c?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcutil/unix/silcunixsocketstream.c (original)
+++ silc-client/branches/upstream/current/lib/silcutil/unix/silcunixsocketstream.c Tue Oct 7 15:45:31 2008
@@ -4,7 +4,7 @@
Author: Pekka Riikonen <priikone at silcnet.org>
- Copyright (C) 1997 - 2007 Pekka Riikonen
+ Copyright (C) 1997 - 2008 Pekka Riikonen
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
@@ -106,8 +106,9 @@
/* If QoS was applied, return the data that was pending. */
if (sock->qos->applied && sock->qos->data_len) {
memcpy(buf, qosbuf, sock->qos->data_len);
+ len = sock->qos->data_len;
sock->qos->data_len = 0;
- return sock->qos->data_len;
+ return len;
}
/* If we have active QoS data pending, return with no data */
@@ -116,7 +117,8 @@
return -1;
}
- /* Read the data from the socket. Never read more than the max limit. */
+ /* Read the data from the socket. The qosbuf size is always the max
+ read limit size. */
len = (buf_len < sock->qos->read_limit_bytes ? buf_len :
sock->qos->read_limit_bytes);
len = read(sock->sock, qosbuf, len);
Modified: silc-client/branches/upstream/current/lib/silcvcard/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcvcard/Makefile.am?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcvcard/Makefile.am (original)
+++ silc-client/branches/upstream/current/lib/silcvcard/Makefile.am Tue Oct 7 15:45:31 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcvcard/Makefile.ad file in the source tree.
# Source: ./lib/silcvcard/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
Modified: silc-client/branches/upstream/current/lib/silcvcard/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/branches/upstream/current/lib/silcvcard/Makefile.in?rev=306&op=diff
==============================================================================
--- silc-client/branches/upstream/current/lib/silcvcard/Makefile.in (original)
+++ silc-client/branches/upstream/current/lib/silcvcard/Makefile.in Tue Oct 7 15:45:31 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/silcvcard/Makefile.ad file in the source tree.
# Source: ./lib/silcvcard/Makefile.ad
-# Generated: Thu Mar 20 08:45:12 EET 2008 by priikone
+# Generated: Sat Sep 6 15:20:39 EEST 2008 by priikone
# Distribution: Client
# License:
More information about the Pkg-silc-commits
mailing list