[Pkg-silc-devel] silc-server needs an updated silc-toolkit (was: Re: [Pkg-silc-commits] r122)

[Jérémy Bobbio]

On Mon, Jul 02, 2007 at 12:33:42AM -0000, lunar at users.alioth.debian.org wrote:
> Author: lunar
> Date: Mon Jul  2 00:33:42 2007
> New Revision: 122
> [...]
> 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=122&op=diff
> ==============================================================================
> --- silc-server/trunk/apps/silcd/server_util.c (original)
> +++ silc-server/trunk/apps/silcd/server_util.c Mon Jul  2 00:33:42 2007
> [...]
> @@ -415,10 +413,8 @@
>  	   since the server is local. */
>  	if (!local) {
>  	  SILC_LOG_DEBUG(("Moving client to local list"));
> -	  silc_idcache_add(server->local_list->clients, client_cache->name,
> -			   client_cache->id, client_cache->context);
> -	  silc_idcache_del_by_context(server->global_list->clients, client,
> -				      NULL);
> +	  silc_idcache_move(server->global_list->clients,
> +			    server->local_list->clients, client_cache);
>  	}
>  	server_entry = server_entry->router;
>        } else {
> [...] 
> Modified: silc-server/trunk/lib/silcapputil/silcidcache.h
> URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/lib/silcapputil/silcidcache.h?rev=122&op=diff
> ==============================================================================
> --- silc-server/trunk/lib/silcapputil/silcidcache.h (original)
> +++ silc-server/trunk/lib/silcapputil/silcidcache.h Mon Jul  2 00:33:42 2007
> @@ -240,6 +240,24 @@
>  					void *new_id, char *new_name,
>  					SilcBool free_old_name);
>  
> +/****f* silcapputil/SilcIDCacheAPI/silc_idcache_move
> + *
> + * SYNOPSIS
> + *
> + *    SilcBool silc_idcache_move(SilcIDCache from_cache, SilcIDCache to_cache,
> + *                               SilcIDCacheEntry entry);
> + *
> + * DESCRIPTION
> + *
> + *    Moves the ID cache entry indicated by `entry' from the `from_cache'
> + *    to `to_cache'.  After this returns TRUE the `entry' is available only
> + *    from the `to_cache'.  Return FALSE if `entry' is not in `from_cache'
> + *    or system is out of memory.
> + *
> + ***/
> +SilcBool silc_idcache_move(SilcIDCache from_cache, SilcIDCache to_cache,
> +			   SilcIDCacheEntry entry);
> +
>  /****f* silcapputil/SilcIDCacheAPI/silc_idcache_get_all
>   *
>   * SYNOPSIS
> 

Another API change from upstream in libslic prevent silc-server to build
against the libsilc-1.1-2-dev package...

As I am pretty sure upstream will release a new silc-toolkit before the
packages leave the NEW queue, I am not sure if we should backport this
change to our current silc-toolkit in order to upload silc-server.

There is also a few issues currently left, see debian/TODO.

Cheers,
-- 
Jérémy Bobbio                        .''`. 
lunar at debian.org                    : :Ⓐ  :  # apt-get install anarchism
                                    `. `'` 
                                      `-   
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-silc-devel/attachments/20070702/0b6da566/attachment.pgp