[Pkg-silc-commits] r264 - in /silc-server/trunk: ./ apps/ apps/silcd/ debian/ doc/ includes/ lib/ lib/contrib/ lib/silcapputil/ lib/silcasn1/ lib/silccore/ lib/silccrypt/ lib/silchttp/ lib/silcmath/ lib/silcske/ lib/silcskr/ lib/silcutil/ lib/silcutil/unix/
lunar at users.alioth.debian.org
lunar at users.alioth.debian.org
Mon Apr 14 19:03:12 UTC 2008
Author: lunar
Date: Mon Apr 14 19:03:12 2008
New Revision: 264
URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=264
Log:
* New upstream release.
Added:
silc-server/trunk/ChangeLog
- copied unchanged from r263, silc-server/branches/upstream/current/ChangeLog
Removed:
silc-server/trunk/CHANGES
Modified:
silc-server/trunk/Makefile.am
silc-server/trunk/Makefile.in
silc-server/trunk/apps/Makefile.am
silc-server/trunk/apps/Makefile.in
silc-server/trunk/apps/silcd/command.c
silc-server/trunk/apps/silcd/server.c
silc-server/trunk/apps/silcd/server_util.c
silc-server/trunk/apps/silcd/serverconfig.c
silc-server/trunk/apps/silcd/silc-server.spec
silc-server/trunk/configure
silc-server/trunk/configure.ac
silc-server/trunk/debian/changelog
silc-server/trunk/doc/Makefile.am
silc-server/trunk/doc/Makefile.in
silc-server/trunk/includes/Makefile.am
silc-server/trunk/includes/Makefile.in
silc-server/trunk/includes/silcdistdefs.h
silc-server/trunk/lib/Makefile.am
silc-server/trunk/lib/Makefile.in
silc-server/trunk/lib/contrib/Makefile.am
silc-server/trunk/lib/contrib/Makefile.in
silc-server/trunk/lib/silcapputil/Makefile.am
silc-server/trunk/lib/silcapputil/Makefile.in
silc-server/trunk/lib/silcapputil/silcidcache.c
silc-server/trunk/lib/silcasn1/Makefile.am
silc-server/trunk/lib/silcasn1/Makefile.in
silc-server/trunk/lib/silccore/Makefile.am
silc-server/trunk/lib/silccore/Makefile.in
silc-server/trunk/lib/silccore/silcpacket.c
silc-server/trunk/lib/silccrypt/Makefile.am
silc-server/trunk/lib/silccrypt/Makefile.in
silc-server/trunk/lib/silchttp/Makefile.am
silc-server/trunk/lib/silchttp/Makefile.in
silc-server/trunk/lib/silcmath/Makefile.am
silc-server/trunk/lib/silcmath/Makefile.in
silc-server/trunk/lib/silcske/Makefile.am
silc-server/trunk/lib/silcske/Makefile.in
silc-server/trunk/lib/silcskr/Makefile.am
silc-server/trunk/lib/silcskr/Makefile.in
silc-server/trunk/lib/silcskr/silcskr.c
silc-server/trunk/lib/silcutil/Makefile.am
silc-server/trunk/lib/silcutil/Makefile.in
silc-server/trunk/lib/silcutil/silcfdstream.c
silc-server/trunk/lib/silcutil/silcsocketstream.c
silc-server/trunk/lib/silcutil/silcsocketstream_i.h
silc-server/trunk/lib/silcutil/unix/silcunixschedule.c
silc-server/trunk/lib/silcutil/unix/silcunixsocketstream.c
Modified: silc-server/trunk/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/Makefile.am (original)
+++ silc-server/trunk/Makefile.am Mon Apr 14 19:03:12 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:47:39 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
@@ -27,7 +27,7 @@
SUBDIRS = @LIBSUBDIR@ apps includes doc
-EXTRA_DIST = silcdefs.h.in libtoolfix CHANGES CREDITS
+EXTRA_DIST = silcdefs.h.in libtoolfix CREDITS
include $(top_srcdir)/Makefile.defines.in
Modified: silc-server/trunk/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/Makefile.in (original)
+++ silc-server/trunk/Makefile.in Mon Apr 14 19:03:12 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:47:39 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
@@ -98,8 +98,9 @@
$(srcdir)/Makefile.defines.in \
$(srcdir)/Makefile.defines_int.in $(srcdir)/Makefile.in \
$(srcdir)/silcdefs.h.in $(top_srcdir)/Makefile.defines.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
@@ -289,7 +290,7 @@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
SUBDIRS = @LIBSUBDIR@ apps includes doc
-EXTRA_DIST = silcdefs.h.in libtoolfix CHANGES CREDITS
+EXTRA_DIST = silcdefs.h.in libtoolfix CREDITS
#
# INCLUDE defines
Modified: silc-server/trunk/apps/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/apps/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/apps/Makefile.am (original)
+++ silc-server/trunk/apps/Makefile.am Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:36 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/apps/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/apps/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/apps/Makefile.in (original)
+++ silc-server/trunk/apps/Makefile.in Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:36 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/apps/silcd/command.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/apps/silcd/command.c?rev=264&op=diff
==============================================================================
--- silc-server/trunk/apps/silcd/command.c (original)
+++ silc-server/trunk/apps/silcd/command.c Mon Apr 14 19:03:12 2008
@@ -4368,8 +4368,10 @@
pk = silc_argument_get_next_arg(pkargs, &type, &pk_len);
while (pk) {
- if (!silc_public_key_payload_decode(pk, pk_len, &public_key))
+ if (!silc_public_key_payload_decode(pk, pk_len, &public_key)) {
+ pk = silc_argument_get_next_arg(pkargs, &type, &pk_len);
continue;
+ }
if (type == 0x03)
type = 0x00;
Modified: silc-server/trunk/apps/silcd/server.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/apps/silcd/server.c?rev=264&op=diff
==============================================================================
--- silc-server/trunk/apps/silcd/server.c (original)
+++ silc-server/trunk/apps/silcd/server.c Mon Apr 14 19:03:12 2008
@@ -268,6 +268,9 @@
SILC_LOG_ERROR(("Connection %s:%d [%s]: %s", ip, port,
SILC_CONNTYPE_STRING(idata->conn_type),
silc_packet_error_string(error)));
+
+ if (!silc_packet_stream_is_valid(stream))
+ return;
silc_schedule_task_add_timeout(server->schedule,
silc_server_packet_error_timeout,
@@ -2845,7 +2848,7 @@
SILC_TASK_CALLBACK(silc_server_close_connection_final)
{
- silc_packet_stream_destroy(context);
+ silc_packet_stream_unref(context);
}
/* Closes connection to socket connection */
@@ -2857,6 +2860,9 @@
char tmp[128];
const char *hostname;
SilcUInt16 port;
+
+ if (!silc_packet_stream_is_valid(sock))
+ return;
memset(tmp, 0, sizeof(tmp));
// silc_socket_get_error(sock, tmp, sizeof(tmp));
@@ -2872,6 +2878,11 @@
silc_server_connection_free(idata->sconn);
idata->sconn = NULL;
}
+
+ /* Take a reference and then destroy the stream. The last reference
+ is released later in a timeout callback. */
+ silc_packet_stream_ref(sock);
+ silc_packet_stream_destroy(sock);
/* Close connection with timeout */
server->stat.conn_num--;
Modified: silc-server/trunk/apps/silcd/server_util.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/apps/silcd/server_util.c?rev=264&op=diff
==============================================================================
--- silc-server/trunk/apps/silcd/server_util.c (original)
+++ silc-server/trunk/apps/silcd/server_util.c Mon Apr 14 19:03:12 2008
@@ -4,7 +4,7 @@
Author: Pekka Riikonen <priikone at silcnet.org>
- Copyright (C) 1997 - 2005, 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
@@ -997,7 +997,7 @@
silc_dlist_start(server->conns);
while ((conn = silc_dlist_get(server->conns))) {
- if (!conn->sock)
+ if (!conn->sock || !silc_packet_stream_is_valid(conn->sock))
continue;
silc_socket_stream_get_info(silc_packet_stream_get_stream(conn->sock),
NULL, NULL, &ipaddr, NULL);
@@ -1023,7 +1023,7 @@
silc_dlist_start(server->conns);
while ((conn = silc_dlist_get(server->conns))) {
- if (!conn->sock)
+ if (!conn->sock || !silc_packet_stream_is_valid(conn->sock))
continue;
idata = silc_packet_get_context(conn->sock);
silc_socket_stream_get_info(silc_packet_stream_get_stream(conn->sock),
Modified: silc-server/trunk/apps/silcd/serverconfig.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/apps/silcd/serverconfig.c?rev=264&op=diff
==============================================================================
--- silc-server/trunk/apps/silcd/serverconfig.c (original)
+++ silc-server/trunk/apps/silcd/serverconfig.c Mon Apr 14 19:03:12 2008
@@ -640,10 +640,11 @@
/* Check the private key file permissions. */
if ((stat(file_tmp, &st)) != -1) {
- if ((st.st_mode & 0777) != 0600) {
+ if (((st.st_mode & 0777) != 0600) &&
+ ((st.st_mode & 0777) != 0640)) {
SILC_SERVER_LOG_ERROR(("Wrong permissions in private key "
"file \"%s\". The permissions must be "
- "0600.", file_tmp));
+ "0600 or 0640.", file_tmp));
return SILC_CONFIG_ESILENT;
}
}
Modified: silc-server/trunk/apps/silcd/silc-server.spec
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/apps/silcd/silc-server.spec?rev=264&op=diff
==============================================================================
--- silc-server/trunk/apps/silcd/silc-server.spec (original)
+++ silc-server/trunk/apps/silcd/silc-server.spec Mon Apr 14 19:03:12 2008
@@ -1,6 +1,6 @@
Summary: SILC Server
Name: silc-server
-Version: 1.1.2
+Version: 1.1.3
Release: 0.fc8
License: GPL
Group: Applications/Communications
Modified: silc-server/trunk/configure
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/configure?rev=264&op=diff
==============================================================================
--- silc-server/trunk/configure (original)
+++ silc-server/trunk/configure Mon Apr 14 19:03:12 2008
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Server 1.1.2.
+# Generated by GNU Autoconf 2.61 for Server 1.1.3.
#
# Report bugs to <silc-devel at lists.silcnet.org>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='Server'
PACKAGE_TARNAME='silc-server'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='Server 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='Server 1.1.3'
PACKAGE_BUGREPORT='silc-devel at lists.silcnet.org'
# Factoring default headers for most tests.
@@ -1474,7 +1474,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 Server 1.1.2 to adapt to many kinds of systems.
+\`configure' configures Server 1.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1545,7 +1545,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Server 1.1.2:";;
+ short | recursive ) echo "Configuration of Server 1.1.3:";;
esac
cat <<\_ACEOF
@@ -1668,7 +1668,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Server configure 1.1.2
+Server configure 1.1.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1682,7 +1682,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Server $as_me 1.1.2, which was
+It was created by Server $as_me 1.1.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2498,7 +2498,7 @@
# Define the identity of the package.
PACKAGE='silc-server'
- VERSION='1.1.2'
+ VERSION='1.1.3'
cat >>confdefs.h <<_ACEOF
@@ -31728,7 +31728,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Server $as_me 1.1.2, which was
+This file was extended by Server $as_me 1.1.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -31781,7 +31781,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Server config.status 1.1.2
+Server config.status 1.1.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: silc-server/trunk/configure.ac
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/configure.ac?rev=264&op=diff
==============================================================================
--- silc-server/trunk/configure.ac (original)
+++ silc-server/trunk/configure.ac Mon Apr 14 19:03:12 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:47:41 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:36 EEST 2008 by priikone
# Distribution: Server
# License:
@@ -23,7 +23,7 @@
# GNU General Public License for more details.
#
-AC_INIT([Server], [1.1.2], [silc-devel at lists.silcnet.org], [silc-server])
+AC_INIT([Server], [1.1.3], [silc-devel at lists.silcnet.org], [silc-server])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE
AC_PREREQ(2.52)
Modified: silc-server/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/changelog?rev=264&op=diff
==============================================================================
--- silc-server/trunk/debian/changelog (original)
+++ silc-server/trunk/debian/changelog Mon Apr 14 19:03:12 2008
@@ -1,3 +1,9 @@
+silc-server (1.1.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Jérémy Bobbio <lunar at debian.org> Mon, 14 Apr 2008 20:57:56 +0200
+
silc-server (1.1.2-1) UNRELEASED; urgency=low
* New upstream release:
Modified: silc-server/trunk/doc/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/doc/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/doc/Makefile.am (original)
+++ silc-server/trunk/doc/Makefile.am Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:36 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/doc/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/doc/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/doc/Makefile.in (original)
+++ silc-server/trunk/doc/Makefile.in Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:36 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/includes/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/includes/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/includes/Makefile.am (original)
+++ silc-server/trunk/includes/Makefile.am Mon Apr 14 19:03:12 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:47:39 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/includes/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/includes/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/includes/Makefile.in (original)
+++ silc-server/trunk/includes/Makefile.in Mon Apr 14 19:03:12 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:47:39 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/includes/silcdistdefs.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/includes/silcdistdefs.h?rev=264&op=diff
==============================================================================
--- silc-server/trunk/includes/silcdistdefs.h (original)
+++ silc-server/trunk/includes/silcdistdefs.h Mon Apr 14 19:03:12 2008
@@ -1,7 +1,7 @@
/*
Automatically generated by Autodist 1.4. Do not edit.
- Generated: Thu Mar 20 08:47:39 EET 2008 by priikone
+ Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
Distribution: Server
License:
*/
Modified: silc-server/trunk/lib/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/Makefile.am (original)
+++ silc-server/trunk/lib/Makefile.am Mon Apr 14 19:03:12 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:47:39 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/Makefile.in (original)
+++ silc-server/trunk/lib/Makefile.in Mon Apr 14 19:03:12 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:47:39 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/contrib/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/contrib/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/contrib/Makefile.am (original)
+++ silc-server/trunk/lib/contrib/Makefile.am Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/contrib/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/contrib/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/contrib/Makefile.in (original)
+++ silc-server/trunk/lib/contrib/Makefile.in Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcapputil/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcapputil/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcapputil/Makefile.am (original)
+++ silc-server/trunk/lib/silcapputil/Makefile.am Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcapputil/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcapputil/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcapputil/Makefile.in (original)
+++ silc-server/trunk/lib/silcapputil/Makefile.in Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcapputil/silcidcache.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcapputil/silcidcache.c?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcapputil/silcidcache.c (original)
+++ silc-server/trunk/lib/silcapputil/silcidcache.c Mon Apr 14 19:03:12 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-server/trunk/lib/silcasn1/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcasn1/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcasn1/Makefile.am (original)
+++ silc-server/trunk/lib/silcasn1/Makefile.am Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcasn1/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcasn1/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcasn1/Makefile.in (original)
+++ silc-server/trunk/lib/silcasn1/Makefile.in Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silccore/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silccore/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silccore/Makefile.am (original)
+++ silc-server/trunk/lib/silccore/Makefile.am Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:36 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silccore/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silccore/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silccore/Makefile.in (original)
+++ silc-server/trunk/lib/silccore/Makefile.in Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:36 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silccore/silcpacket.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silccore/silcpacket.c?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silccore/silcpacket.c (original)
+++ silc-server/trunk/lib/silccore/silcpacket.c Mon Apr 14 19:03:12 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;
}
@@ -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));
Modified: silc-server/trunk/lib/silccrypt/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silccrypt/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silccrypt/Makefile.am (original)
+++ silc-server/trunk/lib/silccrypt/Makefile.am Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silccrypt/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silccrypt/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silccrypt/Makefile.in (original)
+++ silc-server/trunk/lib/silccrypt/Makefile.in Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silchttp/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silchttp/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silchttp/Makefile.am (original)
+++ silc-server/trunk/lib/silchttp/Makefile.am Mon Apr 14 19:03:12 2008
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silchttp/Makefile.ad file in the source tree.
# Source: ./lib/silchttp/Makefile.ad
-# Generated: Thu Mar 20 08:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:36 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silchttp/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silchttp/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silchttp/Makefile.in (original)
+++ silc-server/trunk/lib/silchttp/Makefile.in Mon Apr 14 19:03:12 2008
@@ -18,7 +18,7 @@
# To make changes edit the ./lib/silchttp/Makefile.ad file in the source tree.
# Source: ./lib/silchttp/Makefile.ad
-# Generated: Thu Mar 20 08:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:36 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcmath/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcmath/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcmath/Makefile.am (original)
+++ silc-server/trunk/lib/silcmath/Makefile.am Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcmath/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcmath/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcmath/Makefile.in (original)
+++ silc-server/trunk/lib/silcmath/Makefile.in Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcske/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcske/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcske/Makefile.am (original)
+++ silc-server/trunk/lib/silcske/Makefile.am Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcske/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcske/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcske/Makefile.in (original)
+++ silc-server/trunk/lib/silcske/Makefile.in Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcskr/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcskr/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcskr/Makefile.am (original)
+++ silc-server/trunk/lib/silcskr/Makefile.am Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcskr/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcskr/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcskr/Makefile.in (original)
+++ silc-server/trunk/lib/silcskr/Makefile.in Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:35 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcskr/silcskr.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcskr/silcskr.c?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcskr/silcskr.c (original)
+++ silc-server/trunk/lib/silcskr/silcskr.c Mon Apr 14 19:03:12 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-server/trunk/lib/silcutil/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcutil/Makefile.am?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcutil/Makefile.am (original)
+++ silc-server/trunk/lib/silcutil/Makefile.am Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:36 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcutil/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcutil/Makefile.in?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcutil/Makefile.in (original)
+++ silc-server/trunk/lib/silcutil/Makefile.in Mon Apr 14 19:03:12 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:47:40 EET 2008 by priikone
+# Generated: Sat Apr 12 18:52:36 EEST 2008 by priikone
# Distribution: Server
# License:
Modified: silc-server/trunk/lib/silcutil/silcfdstream.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcutil/silcfdstream.c?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcutil/silcfdstream.c (original)
+++ silc-server/trunk/lib/silcutil/silcfdstream.c Mon Apr 14 19:03:12 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-server/trunk/lib/silcutil/silcsocketstream.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcutil/silcsocketstream.c?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcutil/silcsocketstream.c (original)
+++ silc-server/trunk/lib/silcutil/silcsocketstream.c Mon Apr 14 19:03:12 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-server/trunk/lib/silcutil/silcsocketstream_i.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcutil/silcsocketstream_i.h?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcutil/silcsocketstream_i.h (original)
+++ silc-server/trunk/lib/silcutil/silcsocketstream_i.h Mon Apr 14 19:03:12 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-server/trunk/lib/silcutil/unix/silcunixschedule.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcutil/unix/silcunixschedule.c?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcutil/unix/silcunixschedule.c (original)
+++ silc-server/trunk/lib/silcutil/unix/silcunixschedule.c Mon Apr 14 19:03:12 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-server/trunk/lib/silcutil/unix/silcunixsocketstream.c
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcutil/unix/silcunixsocketstream.c?rev=264&op=diff
==============================================================================
--- silc-server/trunk/lib/silcutil/unix/silcunixsocketstream.c (original)
+++ silc-server/trunk/lib/silcutil/unix/silcunixsocketstream.c Mon Apr 14 19:03:12 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);
More information about the Pkg-silc-commits
mailing list