diff -Nru znc-1.6.5/aclocal.m4 znc-1.6.6/aclocal.m4 --- znc-1.6.5/aclocal.m4 2017-03-12 21:01:02.000000000 +0000 +++ znc-1.6.6/aclocal.m4 2018-03-05 08:17:39.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -12,32 +12,63 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.2]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -59,18 +90,19 @@ PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -80,8 +112,10 @@ $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -93,10 +127,11 @@ else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -104,26 +139,24 @@ else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -133,11 +166,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -154,7 +187,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -170,16 +203,40 @@ AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -190,16 +247,18 @@ AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -210,13 +269,15 @@ AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. AC_DEFUN([PKG_CHECK_VAR], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl @@ -225,11 +286,11 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR +])dnl PKG_CHECK_VAR # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -260,7 +321,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru znc-1.6.5/ChangeLog.md znc-1.6.6/ChangeLog.md --- znc-1.6.5/ChangeLog.md 2017-03-12 21:00:57.000000000 +0000 +++ znc-1.6.6/ChangeLog.md 2018-03-05 08:17:38.000000000 +0000 @@ -1,6 +1,14 @@ -# ZNC 1.6.5 (2017-03-12) +# ZNC 1.6.6 (2018-03-05) + +* Fix use-after-free in `znc --makepem`. It was broken for a long time, but + started segfaulting only now. This is a useability fix, not a security fix, + because self-signed (or signed by a CA) certificates can be created + without using `--makepem`, and then combined into znc.pem. +* Fix build on Cygwin. + -## Fixes + +# ZNC 1.6.5 (2017-03-12) * Fixed a regression of 1.6.4 which caused a crash in modperl/modpython. * Fixed the behavior of `verbose` command in the sasl module. diff -Nru znc-1.6.5/config.guess znc-1.6.6/config.guess --- znc-1.6.5/config.guess 2017-03-12 21:01:03.000000000 +0000 +++ znc-1.6.6/config.guess 2018-03-05 08:17:40.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2016-10-02' +timestamp='2017-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." diff -Nru znc-1.6.5/config.sub znc-1.6.6/config.sub --- znc-1.6.5/config.sub 2017-03-12 21:01:03.000000000 +0000 +++ znc-1.6.6/config.sub 2018-03-05 08:17:40.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2016-11-04' +timestamp='2017-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -67,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1415,7 +1415,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ @@ -1427,7 +1427,7 @@ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1656,6 +1656,9 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; diff -Nru znc-1.6.5/configure znc-1.6.6/configure --- znc-1.6.5/configure 2017-03-12 21:01:03.000000000 +0000 +++ znc-1.6.6/configure 2018-03-05 08:17:40.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for znc 1.6.5. +# Generated by GNU Autoconf 2.69 for znc 1.6.6. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='znc' PACKAGE_TARNAME='znc' -PACKAGE_VERSION='1.6.5' -PACKAGE_STRING='znc 1.6.5' +PACKAGE_VERSION='1.6.6' +PACKAGE_STRING='znc 1.6.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1263,7 +1263,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 znc 1.6.5 to adapt to many kinds of systems. +\`configure' configures znc 1.6.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1328,7 +1328,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of znc 1.6.5:";; + short | recursive ) echo "Configuration of znc 1.6.6:";; esac cat <<\_ACEOF @@ -1464,7 +1464,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -znc configure 1.6.5 +znc configure 1.6.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1632,7 +1632,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by znc $as_me 1.6.5, which was +It was created by znc $as_me 1.6.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3794,7 +3794,7 @@ fi -for ac_func in lstat getopt_long getpassphrase +for ac_func in lstat getopt_long getpassphrase tcsetattr do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -4389,7 +4389,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -4504,7 +4504,7 @@ elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } # Don't reorder this! @@ -4757,8 +4757,8 @@ old_HAVE_ICU="$HAVE_ICU" pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for icu" >&5 -$as_echo_n "checking for icu... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for icu-uc" >&5 +$as_echo_n "checking for icu-uc... " >&6; } if test -n "$icu_CFLAGS"; then pkg_cv_icu_CFLAGS="$icu_CFLAGS" @@ -4798,7 +4798,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -4828,7 +4828,7 @@ HAVE_ICU="no (icu-uc not found via pkg-config)" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -5231,8 +5231,8 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python" >&5 -$as_echo_n "checking for python... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PYTHON >= 3.0" >&5 +$as_echo_n "checking for $PYTHON >= 3.0... " >&6; } if test -n "$python_CFLAGS"; then pkg_cv_python_CFLAGS="$python_CFLAGS" @@ -5272,7 +5272,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -5290,7 +5290,7 @@ as_fn_error $? "$PYTHON.pc not found or is wrong. Try --disable-python or install python3." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "$PYTHON.pc not found or is wrong. Try --disable-python or install python3." "$LINENO" 5 else @@ -6108,7 +6108,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by znc $as_me 1.6.5, which was +This file was extended by znc $as_me 1.6.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6170,7 +6170,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -znc config.status 1.6.5 +znc config.status 1.6.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -6899,7 +6899,7 @@ fi echo -echo ZNC 1.6.5 configured +echo ZNC 1.6.6 configured echo echo "prefix: $prefix" echo "debug: $DEBUG" diff -Nru znc-1.6.5/configure.ac znc-1.6.6/configure.ac --- znc-1.6.5/configure.ac 2017-03-12 21:00:57.000000000 +0000 +++ znc-1.6.6/configure.ac 2018-03-05 08:17:38.000000000 +0000 @@ -7,7 +7,7 @@ dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62 AC_PREREQ([2.62]) dnl Keep the version number in sync with version.h! -AC_INIT([znc], [1.6.5]) +AC_INIT([znc], [1.6.6]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/znc.cpp]) AC_LANG([C++]) @@ -240,7 +240,7 @@ fi AC_CHECK_LIB( gnugetopt, getopt_long,) -AC_CHECK_FUNCS([lstat getopt_long getpassphrase]) +AC_CHECK_FUNCS([lstat getopt_long getpassphrase tcsetattr]) # ----- Check for dlopen diff -Nru znc-1.6.5/debian/changelog znc-1.6.6/debian/changelog --- znc-1.6.5/debian/changelog 2018-02-06 17:55:58.000000000 +0000 +++ znc-1.6.6/debian/changelog 2018-03-15 14:42:53.000000000 +0000 @@ -1,32 +1,14 @@ -znc (1.6.5-2build5) bionic; urgency=high +znc (1.6.6-1) unstable; urgency=medium - * No change rebuild against openssl1.1. - - -- Dimitri John Ledkov Tue, 06 Feb 2018 17:55:58 +0000 - -znc (1.6.5-2build4) bionic; urgency=medium - - * No-change rebuild for icu soname change. - - -- Matthias Klose Tue, 07 Nov 2017 08:56:13 +0000 - -znc (1.6.5-2build3) bionic; urgency=medium - - * No-change rebuild for libicu soname change. - - -- Matthias Klose Wed, 25 Oct 2017 15:49:31 +0000 - -znc (1.6.5-2build2) artful; urgency=medium - - * No-change rebuild for perl 5.26.0. - - -- Matthias Klose Wed, 26 Jul 2017 20:13:57 +0000 - -znc (1.6.5-2build1) artful; urgency=medium - - * No-change rebuild to build with python3.6. + * New upstream release. + * Use a safe URL in debian/watch and for the homepage filed. + * Bump Standards-Version to 4.1.3. + * Bump debian/compat to level 10. + * Move lintian-overrides file to source directory. + * Remove trailing whitespaces from debian/changelog. + * Use secure URIs in debian/copyright. - -- Matthias Klose Mon, 24 Jul 2017 13:54:01 +0000 + -- Patrick Matthäi Thu, 15 Mar 2018 15:42:53 +0100 znc (1.6.5-2) unstable; urgency=medium @@ -821,7 +803,7 @@ * New upstream release: * Forward /names replies for unknown channels. - * Global modules can no longer hook into every config line, but only + * Global modules can no longer hook into every config line, but only those prefixed with 'GM:'. * Don't forward topic changes for detached channels. * Remove ~/.znc/configs/backups and instead only keep one backup under @@ -855,7 +837,7 @@ * Add ClearAllChannelBuffers to *status. * Handle CTCPs to *status. * autoattach now saves and reloads its settings. - * Let webadmin use the user's defaults for new chans. Thanks to SilverLeo. + * Let webadmin use the user's defaults for new chans. Thanks to SilverLeo. -- Joey Hess Tue, 01 Apr 2008 13:13:12 -0400 @@ -919,7 +901,7 @@ * added a JoinTries per-user config option which specifies how often we try to rejoin a channel (default: 0 -> unlimited) * make configure fail if it can't find openssl (or perl, ...) - * new modules: antiidle, nickserv + * new modules: antiidle, nickserv * znc-buildmod contains a bashish, run under bash. -- Joey Hess Mon, 27 Aug 2007 13:44:40 -0400 @@ -948,7 +930,7 @@ znc (0.045-2) unstable; urgency=low - * Fix FTBFS with gcc 4.2 which removes the deprecated >? operator. + * Fix FTBFS with gcc 4.2 which removes the deprecated >? operator. Closes: #393993 -- Joey Hess Fri, 20 Oct 2006 16:23:17 -0400 diff -Nru znc-1.6.5/debian/compat znc-1.6.6/debian/compat --- znc-1.6.5/debian/compat 2017-07-03 09:55:24.000000000 +0000 +++ znc-1.6.6/debian/compat 2018-03-15 14:42:53.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru znc-1.6.5/debian/control znc-1.6.6/debian/control --- znc-1.6.5/debian/control 2018-02-06 17:55:58.000000000 +0000 +++ znc-1.6.6/debian/control 2018-03-15 14:42:53.000000000 +0000 @@ -1,7 +1,7 @@ Source: znc Section: net Priority: optional -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), libssl-dev, libperl-dev, libicu-dev, @@ -12,10 +12,9 @@ swig3.0, dh-python, python3-dev -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Patrick Matthäi -Standards-Version: 4.0.0 -Homepage: http://www.znc.in/ +Maintainer: Patrick Matthäi +Standards-Version: 4.1.3 +Homepage: https://www.znc.in/ Package: znc Architecture: any diff -Nru znc-1.6.5/debian/copyright znc-1.6.6/debian/copyright --- znc-1.6.5/debian/copyright 2017-07-03 09:55:24.000000000 +0000 +++ znc-1.6.6/debian/copyright 2018-03-15 14:42:53.000000000 +0000 @@ -1,6 +1,6 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: znc -Source: http://znc.in/ +Source: https://www.znc.in/ Files: * Copyright: Prozac , diff -Nru znc-1.6.5/debian/source/lintian-overrides znc-1.6.6/debian/source/lintian-overrides --- znc-1.6.5/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ znc-1.6.6/debian/source/lintian-overrides 2018-03-15 14:42:53.000000000 +0000 @@ -0,0 +1 @@ +znc source: source-contains-prebuilt-javascript-object webskins/_default_/pub/jquery-1.11.2.min.js diff -Nru znc-1.6.5/debian/source.lintian-overrides znc-1.6.6/debian/source.lintian-overrides --- znc-1.6.5/debian/source.lintian-overrides 2017-07-03 09:55:24.000000000 +0000 +++ znc-1.6.6/debian/source.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -znc source: source-contains-prebuilt-javascript-object webskins/_default_/pub/jquery-1.11.2.min.js diff -Nru znc-1.6.5/debian/watch znc-1.6.6/debian/watch --- znc-1.6.5/debian/watch 2017-07-03 09:55:24.000000000 +0000 +++ znc-1.6.6/debian/watch 2018-03-15 14:42:53.000000000 +0000 @@ -1,3 +1,3 @@ version=3 opts=pgpsigurlmangle=s/$/.sig/ \ -http://znc.in/releases/znc-([\d.]*).tar.gz +https://znc.in/releases/znc-([\d.]*).tar.gz diff -Nru znc-1.6.5/include/znc/version.h znc-1.6.6/include/znc/version.h --- znc-1.6.5/include/znc/version.h 2017-03-12 21:00:57.000000000 +0000 +++ znc-1.6.6/include/znc/version.h 2018-03-05 08:17:38.000000000 +0000 @@ -4,9 +4,9 @@ // The following defines are for #if comparison (preprocessor only likes ints) #define VERSION_MAJOR 1 #define VERSION_MINOR 6 -#define VERSION_PATCH 5 +#define VERSION_PATCH 6 // This one is for display purpose -#define VERSION_STR "1.6.5" +#define VERSION_STR "1.6.6" // This one is for ZNCModInfo #define VERSION (VERSION_MAJOR + VERSION_MINOR / 10.0) diff -Nru znc-1.6.5/include/znc/zncconfig.h.in znc-1.6.6/include/znc/zncconfig.h.in --- znc-1.6.5/include/znc/zncconfig.h.in 2017-03-12 21:01:02.000000000 +0000 +++ znc-1.6.6/include/znc/zncconfig.h.in 2018-03-05 08:17:40.000000000 +0000 @@ -39,6 +39,9 @@ /* Have PTHREAD_PRIO_INHERIT. */ #undef HAVE_PTHREAD_PRIO_INHERIT +/* Define to 1 if you have the `tcsetattr' function. */ +#undef HAVE_TCSETATTR + /* Define if threaded DNS is enabled */ #undef HAVE_THREADED_DNS diff -Nru znc-1.6.5/install-sh znc-1.6.6/install-sh --- znc-1.6.5/install-sh 2017-03-12 21:01:03.000000000 +0000 +++ znc-1.6.6/install-sh 2018-03-05 08:17:40.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2013-12-25.23; # UTC +scriptversion=2016-01-11.22; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -496,6 +496,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru znc-1.6.5/modules/modperl/swigperlrun.h znc-1.6.6/modules/modperl/swigperlrun.h --- znc-1.6.5/modules/modperl/swigperlrun.h 2017-03-12 21:01:07.000000000 +0000 +++ znc-1.6.6/modules/modperl/swigperlrun.h 2018-03-05 08:17:44.000000000 +0000 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.8 + * Version 3.0.12 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -75,9 +75,11 @@ #endif /* exporting methods */ -#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) -# ifndef GCC_HASCLASSVISIBILITY -# define GCC_HASCLASSVISIBILITY +#if defined(__GNUC__) +# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif # endif #endif @@ -642,16 +644,16 @@ char d = *(c++); unsigned char uu; if ((d >= '0') && (d <= '9')) - uu = ((d - '0') << 4); + uu = (unsigned char)((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) - uu = ((d - ('a'-10)) << 4); + uu = (unsigned char)((d - ('a'-10)) << 4); else return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) - uu |= (d - '0'); + uu |= (unsigned char)(d - '0'); else if ((d >= 'a') && (d <= 'f')) - uu |= (d - ('a'-10)); + uu |= (unsigned char)(d - ('a'-10)); else return (char *) 0; *u = uu; @@ -999,9 +1001,9 @@ # ifdef PERL_OBJECT # define SWIG_croak_null() SWIG_Perl_croak_null(pPerl) -static void SWIG_Perl_croak_null(CPerlObj *pPerl) +static void SWIGUNUSED SWIG_Perl_croak_null(CPerlObj *pPerl) # else -static void SWIG_croak_null() +static void SWIGUNUSED SWIG_croak_null() # endif { SV *err = get_sv("@", GV_ADD); diff -Nru znc-1.6.5/modules/modperl/ZNC.cpp znc-1.6.6/modules/modperl/ZNC.cpp --- znc-1.6.5/modules/modperl/ZNC.cpp 2017-03-12 21:01:07.000000000 +0000 +++ znc-1.6.6/modules/modperl/ZNC.cpp 2018-03-05 08:17:44.000000000 +0000 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.8 + * Version 3.0.12 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -109,9 +109,11 @@ #endif /* exporting methods */ -#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) -# ifndef GCC_HASCLASSVISIBILITY -# define GCC_HASCLASSVISIBILITY +#if defined(__GNUC__) +# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif # endif #endif @@ -661,16 +663,16 @@ char d = *(c++); unsigned char uu; if ((d >= '0') && (d <= '9')) - uu = ((d - '0') << 4); + uu = (unsigned char)((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) - uu = ((d - ('a'-10)) << 4); + uu = (unsigned char)((d - ('a'-10)) << 4); else return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) - uu |= (d - '0'); + uu |= (unsigned char)(d - '0'); else if ((d >= 'a') && (d <= 'f')) - uu |= (d - ('a'-10)); + uu |= (unsigned char)(d - ('a'-10)); else return (char *) 0; *u = uu; @@ -1038,9 +1040,9 @@ # ifdef PERL_OBJECT # define SWIG_croak_null() SWIG_Perl_croak_null(pPerl) -static void SWIG_Perl_croak_null(CPerlObj *pPerl) +static void SWIGUNUSED SWIG_Perl_croak_null(CPerlObj *pPerl) # else -static void SWIG_croak_null() +static void SWIGUNUSED SWIG_croak_null() # endif { SV *err = get_sv("@", GV_ADD); @@ -1712,7 +1714,7 @@ #define SWIG_name "ZNCc::boot_ZNC" #define SWIG_prefix "ZNCc::" -#define SWIGVERSION 0x030008 +#define SWIGVERSION 0x030012 #define SWIG_VERSION SWIGVERSION @@ -1773,20 +1775,24 @@ #define stat struct stat +#include #include #include +SWIGINTERN double SwigSvToNumber(SV* sv) { return SvIOK(sv) ? double(SvIVX(sv)) : SvNVX(sv); } +SWIGINTERN std::string SwigSvToString(SV* sv) { STRLEN len; char *ptr = SvPV(sv, len); return std::string(ptr, len); } +SWIGINTERN void SwigSvFromString(SV* sv, const std::string& s) { sv_setpvn(sv,s.data(),s.size()); } @@ -1865,7 +1871,7 @@ if (cptr) { if (alloc) { if (*alloc == SWIG_NEWOBJ) { - *cptr = reinterpret_cast< char* >(memcpy((new char[size]), cstr, sizeof(char)*(size))); + *cptr = reinterpret_cast< char* >(memcpy(new char[size], cstr, sizeof(char)*(size))); } else { *cptr = cstr; *alloc = SWIG_OLDOBJ; @@ -2365,16 +2371,9 @@ } -SWIGINTERNINLINE SV * -SWIG_From_long SWIG_PERL_DECL_ARGS_1(long value) -{ - SV *sv; - if (IVSIZE >= sizeof(value) || (value >= IV_MIN && value <= IV_MAX)) - sv = newSViv(value); - else - sv = newSVpvf("%ld", value); - return sv_2mortal(sv); -} +#if defined(LLONG_MAX) && !defined(SWIG_LONG_LONG_AVAILABLE) +# define SWIG_LONG_LONG_AVAILABLE +#endif #include @@ -2385,34 +2384,32 @@ #endif +#ifdef SWIG_LONG_LONG_AVAILABLE SWIGINTERNINLINE SV * -SWIG_From_long_SS_long SWIG_PERL_DECL_ARGS_1(long long value) +SWIG_From_unsigned_SS_long_SS_long SWIG_PERL_DECL_ARGS_1(unsigned long long value) { SV *sv; - if (IVSIZE >= sizeof(value) || (value >= IV_MIN && value <= IV_MAX)) - sv = newSViv((IV)(value)); + if (UVSIZE >= sizeof(value) || value <= UV_MAX) + sv = newSVuv((UV)(value)); else { - //sv = newSVpvf("%lld", value); doesn't work in non 64bit Perl + //sv = newSVpvf("%llu", value); doesn't work in non 64bit Perl char temp[256]; - sprintf(temp, "%lld", value); + sprintf(temp, "%llu", value); sv = newSVpv(temp, 0); } return sv_2mortal(sv); } +#endif SWIGINTERNINLINE SV * -SWIG_From_unsigned_SS_long_SS_long SWIG_PERL_DECL_ARGS_1(unsigned long long value) +SWIG_From_long SWIG_PERL_DECL_ARGS_1(long value) { SV *sv; - if (UVSIZE >= sizeof(value) || value <= UV_MAX) - sv = newSVuv((UV)(value)); - else { - //sv = newSVpvf("%llu", value); doesn't work in non 64bit Perl - char temp[256]; - sprintf(temp, "%llu", value); - sv = newSVpv(temp, 0); - } + if (IVSIZE >= sizeof(value) || (value >= IV_MIN && value <= IV_MAX)) + sv = newSViv(value); + else + sv = newSVpvf("%ld", value); return sv_2mortal(sv); } @@ -2424,12 +2421,73 @@ } +#ifdef SWIG_LONG_LONG_AVAILABLE +SWIGINTERN int +SWIG_AsVal_unsigned_SS_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, unsigned long long *val) +{ + if (SvUOK(obj)) { + /* pretty sure this should be conditional on + * (UVSIZE <= sizeof(*val) || v <= ULLONG_MAX) */ + if (val) *val = SvUV(obj); + return SWIG_OK; + } else if (SvIOK(obj)) { + IV v = SvIV(obj); + if (v >= 0 && (IVSIZE <= sizeof(*val) || v <= ULLONG_MAX)) { + if (val) *val = v; + return SWIG_OK; + } else { + return SWIG_OverflowError; + } + } else { + int dispatch = 0; + const char *nptr = SvPV_nolen(obj); + if (nptr) { + char *endptr; + unsigned long long v; + errno = 0; + v = strtoull(nptr, &endptr,0); + if (errno == ERANGE) { + errno = 0; + return SWIG_OverflowError; + } else { + if (*endptr == '\0') { + if (val) *val = v; + return SWIG_Str2NumCast(SWIG_OK); + } + } + } + if (!dispatch) { + const double mant_max = 1LL << DBL_MANT_DIG; + double d; + int res = SWIG_AddCast(SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(obj,&d)); + if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, mant_max)) { + if (val) *val = (unsigned long long)(d); + return res; + } + } + } + return SWIG_TypeError; +} +#endif + + SWIGINTERNINLINE int SWIG_AsVal_size_t SWIG_PERL_DECL_ARGS_2(SV * obj, size_t *val) { - unsigned long v; - int res = SWIG_AsVal_unsigned_SS_long SWIG_PERL_CALL_ARGS_2(obj, val ? &v : 0); - if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v); + int res = SWIG_TypeError; +#ifdef SWIG_LONG_LONG_AVAILABLE + if (sizeof(size_t) <= sizeof(unsigned long)) { +#endif + unsigned long v; + res = SWIG_AsVal_unsigned_SS_long SWIG_PERL_CALL_ARGS_2(obj, val ? &v : 0); + if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v); +#ifdef SWIG_LONG_LONG_AVAILABLE + } else if (sizeof(size_t) <= sizeof(unsigned long long)) { + unsigned long long v; + res = SWIG_AsVal_unsigned_SS_long_SS_long SWIG_PERL_CALL_ARGS_2(obj, val ? &v : 0); + if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v); + } +#endif return res; } @@ -2437,7 +2495,16 @@ SWIGINTERNINLINE SV * SWIG_From_size_t SWIG_PERL_DECL_ARGS_1(size_t value) { - return SWIG_From_unsigned_SS_long SWIG_PERL_CALL_ARGS_1(static_cast< unsigned long >(value)); +#ifdef SWIG_LONG_LONG_AVAILABLE + if (sizeof(size_t) <= sizeof(unsigned long)) { +#endif + return SWIG_From_unsigned_SS_long SWIG_PERL_CALL_ARGS_1(static_cast< unsigned long >(value)); +#ifdef SWIG_LONG_LONG_AVAILABLE + } else { + /* assume sizeof(size_t) <= sizeof(unsigned long long) */ + return SWIG_From_unsigned_SS_long_SS_long SWIG_PERL_CALL_ARGS_1(static_cast< unsigned long long >(value)); + } +#endif } @@ -2478,8 +2545,25 @@ /* Getting isfinite working pre C99 across multiple platforms is non-trivial. Users can provide SWIG_isfinite on older platforms. */ #ifndef SWIG_isfinite +/* isfinite() is a macro for C99 */ # if defined(isfinite) # define SWIG_isfinite(X) (isfinite(X)) +# elif defined __cplusplus && __cplusplus >= 201103L +/* Use a template so that this works whether isfinite() is std::isfinite() or + * in the global namespace. The reality seems to vary between compiler + * versions. + * + * Make sure namespace std exists to avoid compiler warnings. + * + * extern "C++" is required as this fragment can end up inside an extern "C" { } block + */ +namespace std { } +extern "C++" template +inline int SWIG_isfinite_func(T x) { + using namespace std; + return isfinite(x); +} +# define SWIG_isfinite(X) (SWIG_isfinite_func(X)) # elif defined(_MSC_VER) # define SWIG_isfinite(X) (_finite(X)) # elif defined(__sun) && defined(__SVR4) @@ -2625,54 +2709,6 @@ SWIGINTERN std::map< CString,CNick > CChan_GetNicks_(CChan *self){ return self->GetNicks(); } - -SWIGINTERN int -SWIG_AsVal_unsigned_SS_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, unsigned long long *val) -{ - if (SvUOK(obj)) { - /* pretty sure this should be conditional on - * (UVSIZE <= sizeof(*val) || v <= ULLONG_MAX) */ - if (val) *val = SvUV(obj); - return SWIG_OK; - } else if (SvIOK(obj)) { - IV v = SvIV(obj); - if (v >= 0 && (IVSIZE <= sizeof(*val) || v <= ULLONG_MAX)) { - if (val) *val = v; - return SWIG_OK; - } else { - return SWIG_OverflowError; - } - } else { - int dispatch = 0; - const char *nptr = SvPV_nolen(obj); - if (nptr) { - char *endptr; - unsigned long long v; - errno = 0; - v = strtoull(nptr, &endptr,0); - if (errno == ERANGE) { - errno = 0; - return SWIG_OverflowError; - } else { - if (*endptr == '\0') { - if (val) *val = v; - return SWIG_Str2NumCast(SWIG_OK); - } - } - } - if (!dispatch) { - const double mant_max = 1LL << DBL_MANT_DIG; - double d; - int res = SWIG_AddCast(SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(obj,&d)); - if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, mant_max)) { - if (val) *val = (unsigned long long)(d); - return res; - } - } - } - return SWIG_TypeError; -} - SWIGINTERN std::vector< CIRCNetwork * > CUser_GetNetworks_(CUser *self){ return self->GetNetworks(); } @@ -109345,6 +109381,7 @@ XS(SWIG_init) { dXSARGS; int i; + (void)items; SWIG_InitializeModule(0); @@ -109406,12 +109443,12 @@ SWIG_TypeClientData(SWIGTYPE_p_std__dequeT_CBufLine_t, (void*) "ZNC::BufLines"); SWIG_TypeClientData(SWIGTYPE_p_std__vectorT_std__vectorT_CString_t_t, (void*) "ZNC::VVString"); SWIG_TypeClientData(SWIGTYPE_p_CUtils, (void*) "ZNC::CUtils"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CException_EX_Shutdown", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CException::EX_Shutdown))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CException_EX_Restart", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CException::EX_Restart))); SvREADONLY_on(sv); @@ -109420,18 +109457,18 @@ SWIG_TypeClientData(SWIGTYPE_p_CTable, (void*) "ZNC::CTable"); SWIG_TypeClientData(SWIGTYPE_p_CConfigEntry, (void*) "ZNC::CConfigEntry"); SWIG_TypeClientData(SWIGTYPE_p_CConfig, (void*) "ZNC::CConfig"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CS_INVALID_SOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(-1))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; SWIG_TypeClientData(SWIGTYPE_p_CSCharBuffer, (void*) "ZNC::CSCharBuffer"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CSSockAddr_RAF_ANY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CSSockAddr::RAF_ANY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CSSockAddr_RAF_INET", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CSSockAddr::RAF_INET))); SvREADONLY_on(sv); @@ -109441,212 +109478,212 @@ SWIG_TypeClientData(SWIGTYPE_p_CCron, (void*) "ZNC::CCron"); SWIG_TypeClientData(SWIGTYPE_p_CSMonitorFD, (void*) "ZNC::CSMonitorFD"); SWIG_TypeClientData(SWIGTYPE_p_CSockCommon, (void*) "ZNC::CSockCommon"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_OUTBOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::OUTBOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_LISTENER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::LISTENER))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_INBOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::INBOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_READ_EOF", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::READ_EOF))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_READ_ERR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::READ_ERR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_READ_EAGAIN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::READ_EAGAIN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_READ_CONNREFUSED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::READ_CONNREFUSED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_READ_TIMEDOUT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::READ_TIMEDOUT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_SEL_OK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::SEL_OK))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_SEL_TIMEOUT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::SEL_TIMEOUT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_SEL_EAGAIN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::SEL_EAGAIN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_SEL_ERR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::SEL_ERR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_SSL23", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::SSL23))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_SSL2", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::SSL2))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_SSL3", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::SSL3))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_TLS1", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::TLS1))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_TLS11", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::TLS11))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_TLS12", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::TLS12))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_EDP_None", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::EDP_None))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_EDP_SSLv2", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::EDP_SSLv2))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_EDP_SSLv3", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::EDP_SSLv3))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_EDP_TLSv1", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::EDP_TLSv1))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_EDP_TLSv1_1", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::EDP_TLSv1_1))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_EDP_TLSv1_2", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::EDP_TLSv1_2))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_EDP_SSL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::EDP_SSL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_CST_START", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::CST_START))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_CST_DNS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::CST_DNS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_CST_BINDVHOST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::CST_BINDVHOST))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_CST_DESTDNS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::CST_DESTDNS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_CST_CONNECT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::CST_CONNECT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_CST_CONNECTSSL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::CST_CONNECTSSL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_CST_OK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::CST_OK))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_CLT_DONT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::CLT_DONT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_CLT_NOW", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::CLT_NOW))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_CLT_AFTERWRITE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::CLT_AFTERWRITE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_CLT_DEREFERENCE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::CLT_DEREFERENCE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_TMO_READ", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::TMO_READ))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_TMO_WRITE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::TMO_WRITE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_TMO_ACCEPT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::TMO_ACCEPT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_TMO_ALL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::TMO_ALL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_DNS_VHOST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::DNS_VHOST))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Csock_DNS_DEST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Csock::DNS_DEST))); SvREADONLY_on(sv); @@ -109655,32 +109692,32 @@ SWIG_TypeClientData(SWIGTYPE_p_CSConnection, (void*) "ZNC::CSConnection"); SWIG_TypeClientData(SWIGTYPE_p_CSSSLConnection, (void*) "ZNC::CSSSLConnection"); SWIG_TypeClientData(SWIGTYPE_p_CSListener, (void*) "ZNC::CSListener"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CSocketManager_SUCCESS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CSocketManager::SUCCESS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CSocketManager_SELECT_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CSocketManager::SELECT_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CSocketManager_SELECT_TIMEOUT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CSocketManager::SELECT_TIMEOUT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CSocketManager_SELECT_TRYAGAIN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CSocketManager::SELECT_TRYAGAIN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CSocketManager_ECT_Read", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CSocketManager::ECT_Read))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CSocketManager_ECT_Write", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CSocketManager::ECT_Write))); SvREADONLY_on(sv); @@ -109688,17 +109725,17 @@ SWIG_TypeClientData(SWIGTYPE_p_CSocketManager, (void*) "ZNC::CSocketManager"); SWIG_TypeClientData(SWIGTYPE_p_TSocketManagerT_CZNCSock_t, (void*) "ZNC::ZNCSocketManager"); SWIG_TypeClientData(SWIGTYPE_p_CZNCSock, (void*) "ZNC::CZNCSock"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "ADDR_IPV4ONLY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(ADDR_IPV4ONLY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "ADDR_IPV6ONLY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(ADDR_IPV6ONLY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "ADDR_ALL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(ADDR_ALL))); SvREADONLY_on(sv); @@ -109706,67 +109743,67 @@ SWIG_TypeClientData(SWIGTYPE_p_CSockManager, (void*) "ZNC::CSockManager"); SWIG_TypeClientData(SWIGTYPE_p_CSocket, (void*) "ZNC::CSocket"); SWIG_TypeClientData(SWIGTYPE_p_CIRCSocket, (void*) "ZNC::CIRCSocket"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FT_REGULAR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FT_REGULAR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FT_DIRECTORY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FT_DIRECTORY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FT_CHARACTER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FT_CHARACTER))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FT_BLOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FT_BLOCK))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FT_FIFO", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FT_FIFO))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FT_LINK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FT_LINK))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FT_SOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FT_SOCK))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FA_Name", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FA_Name))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FA_Size", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FA_Size))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FA_ATime", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FA_ATime))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FA_MTime", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FA_MTime))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FA_CTime", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FA_CTime))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CFile_FA_UID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CFile::FA_UID))); SvREADONLY_on(sv); @@ -109775,44 +109812,44 @@ SWIG_TypeClientData(SWIGTYPE_p_CDir, (void*) "ZNC::CDir"); SWIG_TypeClientData(SWIGTYPE_p_CTimer, (void*) "ZNC::CTimer"); SWIG_TypeClientData(SWIGTYPE_p_CFPTimer, (void*) "ZNC::CFPTimer"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CModInfo_GlobalModule", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CModInfo::GlobalModule))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CModInfo_UserModule", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CModInfo::UserModule))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CModInfo_NetworkModule", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CModInfo::NetworkModule))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; SWIG_TypeClientData(SWIGTYPE_p_CModInfo, (void*) "ZNC::CModInfo"); SWIG_TypeClientData(SWIGTYPE_p_CModCommand, (void*) "ZNC::CModCommand"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CModule_CONTINUE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CModule::CONTINUE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CModule_HALT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CModule::HALT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CModule_HALTMODS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CModule::HALTMODS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CModule_HALTCORE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CModule::HALTCORE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CModule_UNLOAD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CModule::UNLOAD))); SvREADONLY_on(sv); @@ -109820,129 +109857,129 @@ SWIG_TypeClientData(SWIGTYPE_p_CModule, (void*) "ZNC::CModule"); SWIG_TypeClientData(SWIGTYPE_p_CModules, (void*) "ZNC::CModules"); SWIG_TypeClientData(SWIGTYPE_p_CNick, (void*) "ZNC::CNick"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_Voice", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::Voice))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_HalfOp", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::HalfOp))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_Op", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::Op))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_Admin", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::Admin))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_Owner", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::Owner))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_M_Private", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::M_Private))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_M_Secret", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::M_Secret))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_M_Moderated", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::M_Moderated))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_M_InviteOnly", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::M_InviteOnly))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_M_NoMessages", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::M_NoMessages))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_M_OpTopic", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::M_OpTopic))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_M_Limit", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::M_Limit))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_M_Key", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::M_Key))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_M_Op", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::M_Op))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_M_Voice", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::M_Voice))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_M_Ban", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::M_Ban))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CChan_M_Except", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_char SWIG_PERL_CALL_ARGS_1(static_cast< char >(CChan::M_Except))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; SWIG_TypeClientData(SWIGTYPE_p_CChan, (void*) "ZNC::CChan"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CUser_HASH_NONE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CUser::HASH_NONE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CUser_HASH_MD5", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CUser::HASH_MD5))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CUser_HASH_SHA256", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CUser::HASH_SHA256))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CUser_HASH_DEFAULT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CUser::HASH_DEFAULT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; SWIG_TypeClientData(SWIGTYPE_p_CUser, (void*) "ZNC::CUser"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CIRCNetwork_JOIN_FREQUENCY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CIRCNetwork::JOIN_FREQUENCY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CIRCNetwork_PING_FREQUENCY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CIRCNetwork::PING_FREQUENCY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CIRCNetwork_PING_SLACK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CIRCNetwork::PING_SLACK))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CIRCNetwork_NO_TRAFFIC_TIMEOUT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CIRCNetwork::NO_TRAFFIC_TIMEOUT))); SvREADONLY_on(sv); @@ -109951,38 +109988,38 @@ SWIG_TypeClientData(SWIGTYPE_p_CAuthBase, (void*) "ZNC::CAuthBase"); SWIG_TypeClientData(SWIGTYPE_p_CClientAuth, (void*) "ZNC::CClientAuth"); SWIG_TypeClientData(SWIGTYPE_p_CClient, (void*) "ZNC::CClient"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CIRCSock_ListArg", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CIRCSock::ListArg))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CIRCSock_HasArg", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CIRCSock::HasArg))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CIRCSock_ArgWhenSet", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CIRCSock::ArgWhenSet))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CIRCSock_NoArg", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CIRCSock::NoArg))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; SWIG_TypeClientData(SWIGTYPE_p_CIRCSock, (void*) "ZNC::CIRCSock"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CListener_ACCEPT_IRC", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CListener::ACCEPT_IRC))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CListener_ACCEPT_HTTP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CListener::ACCEPT_HTTP))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CListener_ACCEPT_ALL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CListener::ACCEPT_ALL))); SvREADONLY_on(sv); @@ -109997,50 +110034,50 @@ SWIG_TypeClientData(SWIGTYPE_p_CTemplate, (void*) "ZNC::CTemplate"); SWIG_TypeClientData(SWIGTYPE_p_CZNCTagHandler, (void*) "ZNC::CZNCTagHandler"); SWIG_TypeClientData(SWIGTYPE_p_CWebSession, (void*) "ZNC::CWebSession"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CWebSubPage_F_ADMIN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CWebSubPage::F_ADMIN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; SWIG_TypeClientData(SWIGTYPE_p_CWebSubPage, (void*) "ZNC::CWebSubPage"); SWIG_TypeClientData(SWIGTYPE_p_CWebSessionMap, (void*) "ZNC::CWebSessionMap"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CWebSock_PAGE_NOTFOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CWebSock::PAGE_NOTFOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CWebSock_PAGE_PRINT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CWebSock::PAGE_PRINT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CWebSock_PAGE_DEFERRED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CWebSock::PAGE_DEFERRED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CWebSock_PAGE_DONE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CWebSock::PAGE_DONE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; SWIG_TypeClientData(SWIGTYPE_p_CWebSock, (void*) "ZNC::CWebSock"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CZNC_ECONFIG_NOTHING", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CZNC::ECONFIG_NOTHING))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CZNC_ECONFIG_NEED_REHASH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CZNC::ECONFIG_NEED_REHASH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CZNC_ECONFIG_NEED_WRITE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CZNC::ECONFIG_NEED_WRITE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "CZNC_ECONFIG_NEED_VERBOSE_WRITE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(CZNC::ECONFIG_NEED_VERBOSE_WRITE))); SvREADONLY_on(sv); @@ -110053,17 +110090,17 @@ SWIG_TypeClientData(SWIGTYPE_p_CBufLine, (void*) "ZNC::CBufLine"); SWIG_TypeClientData(SWIGTYPE_p_CBuffer, (void*) "ZNC::CBuffer"); SWIG_TypeClientData(SWIGTYPE_p_CPerlModule, (void*) "ZNC::CPerlModule"); - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Perl_NotFound", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Perl_NotFound))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Perl_Loaded", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Perl_Loaded))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.8/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Perl_LoadError", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Perl_LoadError))); SvREADONLY_on(sv); diff -Nru znc-1.6.5/modules/modperl/ZNC.pm znc-1.6.6/modules/modperl/ZNC.pm --- znc-1.6.5/modules/modperl/ZNC.pm 2017-03-12 21:01:07.000000000 +0000 +++ znc-1.6.6/modules/modperl/ZNC.pm 2018-03-05 08:17:44.000000000 +0000 @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 3.0.8 +# Version 3.0.12 # # Do not make changes to this file unless you know what you are doing--modify # the SWIG interface file instead. diff -Nru znc-1.6.5/modules/modpython/swigpyrun.h znc-1.6.6/modules/modpython/swigpyrun.h --- znc-1.6.5/modules/modpython/swigpyrun.h 2017-03-12 21:01:17.000000000 +0000 +++ znc-1.6.6/modules/modpython/swigpyrun.h 2018-03-05 08:17:53.000000000 +0000 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.8 + * Version 3.0.12 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -75,9 +75,11 @@ #endif /* exporting methods */ -#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) -# ifndef GCC_HASCLASSVISIBILITY -# define GCC_HASCLASSVISIBILITY +#if defined(__GNUC__) +# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif # endif #endif @@ -642,16 +644,16 @@ char d = *(c++); unsigned char uu; if ((d >= '0') && (d <= '9')) - uu = ((d - '0') << 4); + uu = (unsigned char)((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) - uu = ((d - ('a'-10)) << 4); + uu = (unsigned char)((d - ('a'-10)) << 4); else return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) - uu |= (d - '0'); + uu |= (unsigned char)(d - '0'); else if ((d >= 'a') && (d <= 'f')) - uu |= (d - ('a'-10)); + uu |= (unsigned char)(d - ('a'-10)); else return (char *) 0; *u = uu; @@ -816,10 +818,6 @@ } #endif -/* Add PyObject_Del for old Pythons */ -#if PY_VERSION_HEX < 0x01060000 -# define PyObject_Del(op) PyMem_DEL((op)) -#endif #ifndef PyObject_DEL # define PyObject_DEL PyObject_Del #endif @@ -934,6 +932,7 @@ #if PY_VERSION_HEX < 0x03020000 #define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type) #define PyDescr_NAME(x) (((PyDescrObject *)(x))->d_name) +#define Py_hash_t long #endif /* ----------------------------------------------------------------------------- * error manipulation @@ -1878,7 +1877,6 @@ static int type_init = 0; if (!type_init) { const PyTypeObject tmp = { - /* PyObject header changed in Python 3 */ #if PY_VERSION_HEX >= 0x03000000 PyVarObject_HEAD_INIT(NULL, 0) #else @@ -1889,7 +1887,7 @@ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)SwigPyObject_dealloc, /* tp_dealloc */ - 0, /* tp_print */ + 0, /* tp_print */ #if PY_VERSION_HEX < 0x02020000 (getattrfunc)SwigPyObject_getattr, /* tp_getattr */ #else @@ -1897,7 +1895,7 @@ #endif (setattrfunc)0, /* tp_setattr */ #if PY_VERSION_HEX >= 0x03000000 - 0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */ + 0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */ #else (cmpfunc)SwigPyObject_compare, /* tp_compare */ #endif @@ -1907,7 +1905,7 @@ 0, /* tp_as_mapping */ (hashfunc)0, /* tp_hash */ (ternaryfunc)0, /* tp_call */ - 0, /* tp_str */ + 0, /* tp_str */ PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ @@ -2070,7 +2068,6 @@ static int type_init = 0; if (!type_init) { const PyTypeObject tmp = { - /* PyObject header changed in Python 3 */ #if PY_VERSION_HEX>=0x03000000 PyVarObject_HEAD_INIT(NULL, 0) #else diff -Nru znc-1.6.5/modules/modpython/_znc_core.cpp znc-1.6.6/modules/modpython/_znc_core.cpp --- znc-1.6.5/modules/modpython/_znc_core.cpp 2017-03-12 21:01:17.000000000 +0000 +++ znc-1.6.6/modules/modpython/_znc_core.cpp 2018-03-05 08:17:53.000000000 +0000 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.8 + * Version 3.0.12 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -109,9 +109,11 @@ #endif /* exporting methods */ -#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) -# ifndef GCC_HASCLASSVISIBILITY -# define GCC_HASCLASSVISIBILITY +#if defined(__GNUC__) +# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif # endif #endif @@ -671,16 +673,16 @@ char d = *(c++); unsigned char uu; if ((d >= '0') && (d <= '9')) - uu = ((d - '0') << 4); + uu = (unsigned char)((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) - uu = ((d - ('a'-10)) << 4); + uu = (unsigned char)((d - ('a'-10)) << 4); else return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) - uu |= (d - '0'); + uu |= (unsigned char)(d - '0'); else if ((d >= 'a') && (d <= 'f')) - uu |= (d - ('a'-10)); + uu |= (unsigned char)(d - ('a'-10)); else return (char *) 0; *u = uu; @@ -863,10 +865,6 @@ } #endif -/* Add PyObject_Del for old Pythons */ -#if PY_VERSION_HEX < 0x01060000 -# define PyObject_Del(op) PyMem_DEL((op)) -#endif #ifndef PyObject_DEL # define PyObject_DEL PyObject_Del #endif @@ -981,6 +979,7 @@ #if PY_VERSION_HEX < 0x03020000 #define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type) #define PyDescr_NAME(x) (((PyDescrObject *)(x))->d_name) +#define Py_hash_t long #endif /* ----------------------------------------------------------------------------- @@ -1929,7 +1928,6 @@ static int type_init = 0; if (!type_init) { const PyTypeObject tmp = { - /* PyObject header changed in Python 3 */ #if PY_VERSION_HEX >= 0x03000000 PyVarObject_HEAD_INIT(NULL, 0) #else @@ -1940,7 +1938,7 @@ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)SwigPyObject_dealloc, /* tp_dealloc */ - 0, /* tp_print */ + 0, /* tp_print */ #if PY_VERSION_HEX < 0x02020000 (getattrfunc)SwigPyObject_getattr, /* tp_getattr */ #else @@ -1948,7 +1946,7 @@ #endif (setattrfunc)0, /* tp_setattr */ #if PY_VERSION_HEX >= 0x03000000 - 0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */ + 0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */ #else (cmpfunc)SwigPyObject_compare, /* tp_compare */ #endif @@ -1958,7 +1956,7 @@ 0, /* tp_as_mapping */ (hashfunc)0, /* tp_hash */ (ternaryfunc)0, /* tp_call */ - 0, /* tp_str */ + 0, /* tp_str */ PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ @@ -2121,7 +2119,6 @@ static int type_init = 0; if (!type_init) { const PyTypeObject tmp = { - /* PyObject header changed in Python 3 */ #if PY_VERSION_HEX>=0x03000000 PyVarObject_HEAD_INIT(NULL, 0) #else @@ -3231,7 +3228,7 @@ #endif #define SWIG_name "_znc_core" -#define SWIGVERSION 0x030008 +#define SWIGVERSION 0x030012 #define SWIG_VERSION SWIGVERSION @@ -3343,6 +3340,7 @@ using std::allocator; +#include #include @@ -3504,7 +3502,7 @@ return SWIG_OK; #if PY_VERSION_HEX < 0x03000000 } else if (PyInt_Check(obj)) { - if (val) *val = PyInt_AsLong(obj); + if (val) *val = (double) PyInt_AsLong(obj); return SWIG_OK; #endif } else if (PyLong_Check(obj)) { @@ -3625,23 +3623,109 @@ } +#include +#if !defined(SWIG_NO_LLONG_MAX) +# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__) +# define LLONG_MAX __LONG_LONG_MAX__ +# define LLONG_MIN (-LLONG_MAX - 1LL) +# define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL) +# endif +#endif + + +#if defined(LLONG_MAX) && !defined(SWIG_LONG_LONG_AVAILABLE) +# define SWIG_LONG_LONG_AVAILABLE +#endif + + +#ifdef SWIG_LONG_LONG_AVAILABLE +SWIGINTERN int +SWIG_AsVal_unsigned_SS_long_SS_long (PyObject *obj, unsigned long long *val) +{ + int res = SWIG_TypeError; + if (PyLong_Check(obj)) { + unsigned long long v = PyLong_AsUnsignedLongLong(obj); + if (!PyErr_Occurred()) { + if (val) *val = v; + return SWIG_OK; + } else { + PyErr_Clear(); + res = SWIG_OverflowError; + } + } else { + unsigned long v; + res = SWIG_AsVal_unsigned_SS_long (obj,&v); + if (SWIG_IsOK(res)) { + if (val) *val = v; + return res; + } + } +#ifdef SWIG_PYTHON_CAST_MODE + { + const double mant_max = 1LL << DBL_MANT_DIG; + double d; + res = SWIG_AsVal_double (obj,&d); + if (SWIG_IsOK(res) && !SWIG_CanCastAsInteger(&d, 0, mant_max)) + return SWIG_OverflowError; + if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, mant_max)) { + if (val) *val = (unsigned long long)(d); + return SWIG_AddCast(res); + } + res = SWIG_TypeError; + } +#endif + return res; +} +#endif + + SWIGINTERNINLINE int SWIG_AsVal_size_t (PyObject * obj, size_t *val) { - unsigned long v; - int res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0); - if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v); + int res = SWIG_TypeError; +#ifdef SWIG_LONG_LONG_AVAILABLE + if (sizeof(size_t) <= sizeof(unsigned long)) { +#endif + unsigned long v; + res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0); + if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v); +#ifdef SWIG_LONG_LONG_AVAILABLE + } else if (sizeof(size_t) <= sizeof(unsigned long long)) { + unsigned long long v; + res = SWIG_AsVal_unsigned_SS_long_SS_long (obj, val ? &v : 0); + if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v); + } +#endif return res; } - #define SWIG_From_long PyLong_FromLong + #define SWIG_From_long PyInt_FromLong + + +#ifdef SWIG_LONG_LONG_AVAILABLE +SWIGINTERNINLINE PyObject* +SWIG_From_long_SS_long (long long value) +{ + return ((value < LONG_MIN) || (value > LONG_MAX)) ? + PyLong_FromLongLong(value) : PyInt_FromLong(static_cast< long >(value)); +} +#endif SWIGINTERNINLINE PyObject * SWIG_From_ptrdiff_t (ptrdiff_t value) { - return SWIG_From_long (static_cast< long >(value)); +#ifdef SWIG_LONG_LONG_AVAILABLE + if (sizeof(ptrdiff_t) <= sizeof(long)) { +#endif + return SWIG_From_long (static_cast< long >(value)); +#ifdef SWIG_LONG_LONG_AVAILABLE + } else { + /* assume sizeof(ptrdiff_t) <= sizeof(long long) */ + return SWIG_From_long_SS_long (static_cast< long long >(value)); + } +#endif } @@ -3695,12 +3779,65 @@ } +#ifdef SWIG_LONG_LONG_AVAILABLE +SWIGINTERN int +SWIG_AsVal_long_SS_long (PyObject *obj, long long *val) +{ + int res = SWIG_TypeError; + if (PyLong_Check(obj)) { + long long v = PyLong_AsLongLong(obj); + if (!PyErr_Occurred()) { + if (val) *val = v; + return SWIG_OK; + } else { + PyErr_Clear(); + res = SWIG_OverflowError; + } + } else { + long v; + res = SWIG_AsVal_long (obj,&v); + if (SWIG_IsOK(res)) { + if (val) *val = v; + return res; + } + } +#ifdef SWIG_PYTHON_CAST_MODE + { + const double mant_max = 1LL << DBL_MANT_DIG; + const double mant_min = -mant_max; + double d; + res = SWIG_AsVal_double (obj,&d); + if (SWIG_IsOK(res) && !SWIG_CanCastAsInteger(&d, mant_min, mant_max)) + return SWIG_OverflowError; + if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, mant_min, mant_max)) { + if (val) *val = (long long)(d); + return SWIG_AddCast(res); + } + res = SWIG_TypeError; + } +#endif + return res; +} +#endif + + SWIGINTERNINLINE int SWIG_AsVal_ptrdiff_t (PyObject * obj, ptrdiff_t *val) { - long v; - int res = SWIG_AsVal_long (obj, val ? &v : 0); - if (SWIG_IsOK(res) && val) *val = static_cast< ptrdiff_t >(v); + int res = SWIG_TypeError; +#ifdef SWIG_LONG_LONG_AVAILABLE + if (sizeof(ptrdiff_t) <= sizeof(long)) { +#endif + long v; + res = SWIG_AsVal_long (obj, val ? &v : 0); + if (SWIG_IsOK(res) && val) *val = static_cast< ptrdiff_t >(v); +#ifdef SWIG_LONG_LONG_AVAILABLE + } else if (sizeof(ptrdiff_t) <= sizeof(long long)) { + long long v; + res = SWIG_AsVal_long_SS_long (obj, val ? &v : 0); + if (SWIG_IsOK(res) && val) *val = static_cast< ptrdiff_t >(v); + } +#endif return res; } @@ -3763,8 +3900,21 @@ return traits::noconst_type >::type_name(); } - template - struct traits_info { + template struct traits_info { + static swig_type_info *type_query(std::string name) { + name += " *"; + return SWIG_TypeQuery(name.c_str()); + } + static swig_type_info *type_info() { + static swig_type_info *info = type_query(type_name()); + return info; + } + }; + + /* + Partial specialization for pointers (traits_info) + */ + template struct traits_info { static swig_type_info *type_query(std::string name) { name += " *"; return SWIG_TypeQuery(name.c_str()); @@ -3781,7 +3931,7 @@ } /* - Partial specialization for pointers + Partial specialization for pointers (traits) */ template struct traits { typedef pointer_category category; @@ -3851,7 +4001,8 @@ struct traits_asptr { static int asptr(PyObject *obj, Type **val) { Type *p; - int res = SWIG_ConvertPtr(obj, (void**)&p, type_info(), 0); + swig_type_info *descriptor = type_info(); + int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR; if (SWIG_IsOK(res)) { if (val) *val = p; } @@ -3999,7 +4150,7 @@ namespace std { template <> - struct less : public binary_function + struct less { bool operator()(PyObject * v, PyObject *w) const @@ -4024,7 +4175,7 @@ }; template <> - struct less : public binary_function + struct less { bool operator()(const swig::SwigPtr_PyObject& v, const swig::SwigPtr_PyObject& w) const @@ -4034,7 +4185,7 @@ }; template <> - struct less : public binary_function + struct less { bool operator()(const swig::SwigVar_PyObject& v, const swig::SwigVar_PyObject& w) const @@ -4097,7 +4248,7 @@ if (step == 0) { throw std::invalid_argument("slice step cannot be zero"); } else if (step > 0) { - // Required range: 0 <= i < size, 0 <= j < size + // Required range: 0 <= i < size, 0 <= j < size, i <= j if (i < 0) { ii = 0; } else if (i < (Difference)size) { @@ -4105,13 +4256,15 @@ } else if (insert && (i >= (Difference)size)) { ii = (Difference)size; } - if ( j < 0 ) { + if (j < 0) { jj = 0; } else { jj = (j < (Difference)size) ? j : (Difference)size; } + if (jj < ii) + jj = ii; } else { - // Required range: -1 <= i < size-1, -1 <= j < size-1 + // Required range: -1 <= i < size-1, -1 <= j < size-1, i >= j if (i < -1) { ii = -1; } else if (i < (Difference) size) { @@ -4124,6 +4277,8 @@ } else { jj = (j < (Difference)size ) ? j : (Difference)(size-1); } + if (ii < jj) + ii = jj; } } @@ -4149,6 +4304,13 @@ seq->erase(position); } + template + struct traits_reserve { + static void reserve(Sequence & /*seq*/, typename Sequence::size_type /*n*/) { + // This should be specialized for types that support reserve + } + }; + template inline Sequence* getslice(const Sequence* self, Difference i, Difference j, Py_ssize_t step) { @@ -4166,6 +4328,7 @@ return new Sequence(sb, se); } else { Sequence *sequence = new Sequence(); + swig::traits_reserve::reserve(*sequence, (jj - ii + step - 1) / step); typename Sequence::const_iterator it = sb; while (it!=se) { sequence->push_back(*it); @@ -4176,17 +4339,16 @@ } } else { Sequence *sequence = new Sequence(); - if (ii > jj) { - typename Sequence::const_reverse_iterator sb = self->rbegin(); - typename Sequence::const_reverse_iterator se = self->rbegin(); - std::advance(sb,size-ii-1); - std::advance(se,size-jj-1); - typename Sequence::const_reverse_iterator it = sb; - while (it!=se) { - sequence->push_back(*it); - for (Py_ssize_t c=0; c<-step && it!=se; ++c) - it++; - } + swig::traits_reserve::reserve(*sequence, (ii - jj - step - 1) / -step); + typename Sequence::const_reverse_iterator sb = self->rbegin(); + typename Sequence::const_reverse_iterator se = self->rbegin(); + std::advance(sb,size-ii-1); + std::advance(se,size-jj-1); + typename Sequence::const_reverse_iterator it = sb; + while (it!=se) { + sequence->push_back(*it); + for (Py_ssize_t c=0; c<-step && it!=se; ++c) + it++; } return sequence; } @@ -4200,12 +4362,11 @@ Difference jj = 0; swig::slice_adjust(i, j, step, size, ii, jj, true); if (step > 0) { - if (jj < ii) - jj = ii; if (step == 1) { size_t ssize = jj - ii; if (ssize <= is.size()) { // expanding/staying the same size + swig::traits_reserve::reserve(*self, self->size() - ssize + is.size()); typename Sequence::iterator sb = self->begin(); typename InputSeq::const_iterator isit = is.begin(); std::advance(sb,ii); @@ -4239,8 +4400,6 @@ } } } else { - if (jj > ii) - jj = ii; size_t replacecount = (ii - jj - step - 1) / -step; if (is.size() != replacecount) { char msg[1024]; @@ -4266,37 +4425,33 @@ Difference jj = 0; swig::slice_adjust(i, j, step, size, ii, jj, true); if (step > 0) { - if (jj > ii) { - typename Sequence::iterator sb = self->begin(); - std::advance(sb,ii); - if (step == 1) { - typename Sequence::iterator se = self->begin(); - std::advance(se,jj); - self->erase(sb,se); - } else { - typename Sequence::iterator it = sb; - size_t delcount = (jj - ii + step - 1) / step; - while (delcount) { - it = self->erase(it); - for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c) - it++; - delcount--; - } - } - } - } else { - if (ii > jj) { - typename Sequence::reverse_iterator sb = self->rbegin(); - std::advance(sb,size-ii-1); - typename Sequence::reverse_iterator it = sb; - size_t delcount = (ii - jj - step - 1) / -step; + typename Sequence::iterator sb = self->begin(); + std::advance(sb,ii); + if (step == 1) { + typename Sequence::iterator se = self->begin(); + std::advance(se,jj); + self->erase(sb,se); + } else { + typename Sequence::iterator it = sb; + size_t delcount = (jj - ii + step - 1) / step; while (delcount) { - it = typename Sequence::reverse_iterator(self->erase((++it).base())); - for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c) + it = self->erase(it); + for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c) it++; delcount--; } } + } else { + typename Sequence::reverse_iterator sb = self->rbegin(); + std::advance(sb,size-ii-1); + typename Sequence::reverse_iterator it = sb; + size_t delcount = (ii - jj - step - 1) / -step; + while (delcount) { + it = typename Sequence::reverse_iterator(self->erase((++it).base())); + for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c) + it++; + delcount--; + } } } } @@ -4780,8 +4935,8 @@ static int asptr(PyObject *obj, sequence **seq) { if (obj == Py_None || SWIG_Python_GetSwigThis(obj)) { sequence *p; - if (::SWIG_ConvertPtr(obj,(void**)&p, - swig::type_info(),0) == SWIG_OK) { + swig_type_info *descriptor = swig::type_info(); + if (descriptor && SWIG_IsOK(::SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0))) { if (seq) *seq = p; return SWIG_OLDOBJ; } @@ -4820,7 +4975,7 @@ #ifdef SWIG_PYTHON_EXTRA_NATIVE_CONTAINERS swig_type_info *desc = swig::type_info(); if (desc && desc->clientdata) { - return SWIG_NewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN); + return SWIG_InternalNewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN); } #endif size_type size = seq.size(); @@ -4883,14 +5038,33 @@ SWIG_From_unsigned_SS_long (unsigned long value) { return (value > LONG_MAX) ? - PyLong_FromUnsignedLong(value) : PyLong_FromLong(static_cast< long >(value)); + PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value)); +} + + +#ifdef SWIG_LONG_LONG_AVAILABLE +SWIGINTERNINLINE PyObject* +SWIG_From_unsigned_SS_long_SS_long (unsigned long long value) +{ + return (value > LONG_MAX) ? + PyLong_FromUnsignedLongLong(value) : PyInt_FromLong(static_cast< long >(value)); } +#endif SWIGINTERNINLINE PyObject * SWIG_From_size_t (size_t value) { - return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value)); +#ifdef SWIG_LONG_LONG_AVAILABLE + if (sizeof(size_t) <= sizeof(unsigned long)) { +#endif + return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value)); +#ifdef SWIG_LONG_LONG_AVAILABLE + } else { + /* assume sizeof(size_t) <= sizeof(unsigned long long) */ + return SWIG_From_unsigned_SS_long_SS_long (static_cast< unsigned long long >(value)); + } +#endif } SWIGINTERN std::list< CString,std::allocator< CString > > *std_list_Sl_CString_Sg____getslice__(std::list< CString > *self,std::list< CString >::difference_type i,std::list< CString >::difference_type j){ @@ -4979,11 +5153,15 @@ SWIG_InternalNewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void(); } else { #if PY_VERSION_HEX >= 0x03000000 +#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR) + return PyBytes_FromStringAndSize(carray, static_cast< Py_ssize_t >(size)); +#else #if PY_VERSION_HEX >= 0x03010000 return PyUnicode_DecodeUTF8(carray, static_cast< Py_ssize_t >(size), "surrogateescape"); #else return PyUnicode_FromStringAndSize(carray, static_cast< Py_ssize_t >(size)); #endif +#endif #else return PyString_FromStringAndSize(carray, static_cast< Py_ssize_t >(size)); #endif @@ -5005,13 +5183,18 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) { #if PY_VERSION_HEX>=0x03000000 +#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR) + if (PyBytes_Check(obj)) +#else if (PyUnicode_Check(obj)) +#endif #else if (PyString_Check(obj)) #endif { char *cstr; Py_ssize_t len; #if PY_VERSION_HEX>=0x03000000 +#if !defined(SWIG_PYTHON_STRICT_BYTE_CHAR) if (!alloc && cptr) { /* We can't allow converting without allocation, since the internal representation of string in Python 3 is UCS-2/UCS-4 but we require @@ -5020,8 +5203,9 @@ return SWIG_RuntimeError; } obj = PyUnicode_AsUTF8String(obj); - PyBytes_AsStringAndSize(obj, &cstr, &len); if(alloc) *alloc = SWIG_NEWOBJ; +#endif + PyBytes_AsStringAndSize(obj, &cstr, &len); #else PyString_AsStringAndSize(obj, &cstr, &len); #endif @@ -5042,26 +5226,34 @@ if (*alloc == SWIG_NEWOBJ) #endif { - *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); + *cptr = reinterpret_cast< char* >(memcpy(new char[len + 1], cstr, sizeof(char)*(len + 1))); *alloc = SWIG_NEWOBJ; } else { *cptr = cstr; *alloc = SWIG_OLDOBJ; } } else { - #if PY_VERSION_HEX>=0x03000000 - assert(0); /* Should never reach here in Python 3 */ - #endif +#if PY_VERSION_HEX>=0x03000000 +#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR) + *cptr = PyBytes_AsString(obj); +#else + assert(0); /* Should never reach here with Unicode strings in Python 3 */ +#endif +#else *cptr = SWIG_Python_str_AsChar(obj); +#endif } } if (psize) *psize = len + 1; -#if PY_VERSION_HEX>=0x03000000 +#if PY_VERSION_HEX>=0x03000000 && !defined(SWIG_PYTHON_STRICT_BYTE_CHAR) Py_XDECREF(obj); #endif return SWIG_OK; } else { #if defined(SWIG_PYTHON_2_UNICODE) +#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR) +#error "Cannot use both SWIG_PYTHON_2_UNICODE and SWIG_PYTHON_STRICT_BYTE_CHAR at once" +#endif #if PY_VERSION_HEX<0x03000000 if (PyUnicode_Check(obj)) { char *cstr; Py_ssize_t len; @@ -5072,7 +5264,7 @@ if (PyString_AsStringAndSize(obj, &cstr, &len) != -1) { if (cptr) { if (alloc) *alloc = SWIG_NEWOBJ; - *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); + *cptr = reinterpret_cast< char* >(memcpy(new char[len + 1], cstr, sizeof(char)*(len + 1))); } if (psize) *psize = len + 1; @@ -5158,6 +5350,13 @@ namespace swig { template + struct traits_reserve > { + static void reserve(std::vector &seq, typename std::vector::size_type n) { + seq.reserve(n); + } + }; + + template struct traits_asptr > { static int asptr(PyObject *obj, std::vector **vec) { return traits_asptr_stdseq >::asptr(obj, vec); @@ -5441,6 +5640,7 @@ + template struct traits_asptr > { typedef std::pair value_type; @@ -5449,13 +5649,19 @@ std::pair **val) { if (val) { - value_type *vp = (new std::pair); + value_type *vp = (new std::pair()); T *pfirst = &(vp->first); int res1 = swig::asval((PyObject*)first, pfirst); - if (!SWIG_IsOK(res1)) return res1; + if (!SWIG_IsOK(res1)) { + delete vp; + return res1; + } U *psecond = &(vp->second); int res2 = swig::asval((PyObject*)second, psecond); - if (!SWIG_IsOK(res2)) return res2; + if (!SWIG_IsOK(res2)) { + delete vp; + return res2; + } *val = vp; return SWIG_AddNewMask(res1 > res2 ? res1 : res2); } else { @@ -5466,7 +5672,7 @@ int res2 = swig::asval((PyObject*)second, psecond); if (!SWIG_IsOK(res2)) return res2; return res1 > res2 ? res1 : res2; - } + } } static int asptr(PyObject *obj, std::pair **val) { @@ -5483,7 +5689,8 @@ } } else { value_type *p; - res = SWIG_ConvertPtr(obj,(void**)&p,swig::type_info(),0); + swig_type_info *descriptor = swig::type_info(); + res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR; if (SWIG_IsOK(res) && val) *val = p; } return res; @@ -5644,7 +5851,8 @@ res = traits_asptr_stdseq >::asptr(items, val); } else { map_type *p; - res = SWIG_ConvertPtr(obj,(void**)&p,swig::type_info(),0); + swig_type_info *descriptor = swig::type_info(); + res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR; if (SWIG_IsOK(res) && val) *val = p; } SWIG_PYTHON_THREAD_END_BLOCK; @@ -6812,16 +7020,6 @@ SWIGINTERN std::vector< CClient * >::iterator std_vector_Sl_CClient_Sm__Sg__insert__SWIG_0(std::vector< CClient * > *self,std::vector< CClient * >::iterator pos,std::vector< CClient * >::value_type x){ return self->insert(pos, x); } SWIGINTERN void std_vector_Sl_CClient_Sm__Sg__insert__SWIG_1(std::vector< CClient * > *self,std::vector< CClient * >::iterator pos,std::vector< CClient * >::size_type n,std::vector< CClient * >::value_type x){ self->insert(pos, n, x); } -#include -#if !defined(SWIG_NO_LLONG_MAX) -# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__) -# define LLONG_MAX __LONG_LONG_MAX__ -# define LLONG_MIN (-LLONG_MAX - 1LL) -# define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL) -# endif -#endif - - SWIGINTERN int SWIG_AsVal_int (PyObject * obj, int *val) { @@ -6875,22 +7073,6 @@ } -SWIGINTERNINLINE PyObject* -SWIG_From_long_SS_long (long long value) -{ - return ((value < LONG_MIN) || (value > LONG_MAX)) ? - PyLong_FromLongLong(value) : PyLong_FromLong(static_cast< long >(value)); -} - - -SWIGINTERNINLINE PyObject* -SWIG_From_unsigned_SS_long_SS_long (unsigned long long value) -{ - return (value > LONG_MAX) ? - PyLong_FromUnsignedLongLong(value) : PyLong_FromLong(static_cast< long >(value)); -} - - SWIGINTERN int SWIG_AsVal_unsigned_SS_short (PyObject * obj, unsigned short *val) { @@ -6928,8 +7110,25 @@ /* Getting isfinite working pre C99 across multiple platforms is non-trivial. Users can provide SWIG_isfinite on older platforms. */ #ifndef SWIG_isfinite +/* isfinite() is a macro for C99 */ # if defined(isfinite) # define SWIG_isfinite(X) (isfinite(X)) +# elif defined __cplusplus && __cplusplus >= 201103L +/* Use a template so that this works whether isfinite() is std::isfinite() or + * in the global namespace. The reality seems to vary between compiler + * versions. + * + * Make sure namespace std exists to avoid compiler warnings. + * + * extern "C++" is required as this fragment can end up inside an extern "C" { } block + */ +namespace std { } +extern "C++" template +inline int SWIG_isfinite_func(T x) { + using namespace std; + return isfinite(x); +} +# define SWIG_isfinite(X) (SWIG_isfinite_func(X)) # elif defined(_MSC_VER) # define SWIG_isfinite(X) (_finite(X)) # elif defined(__sun) && defined(__SVR4) @@ -7102,43 +7301,6 @@ SWIGINTERN std::map< CString,CNick,std::less< CString >,std::allocator< std::pair< CString const,CNick > > > CChan_GetNicks_(CChan *self){ return self->GetNicks(); } - -SWIGINTERN int -SWIG_AsVal_unsigned_SS_long_SS_long (PyObject *obj, unsigned long long *val) -{ - int res = SWIG_TypeError; - if (PyLong_Check(obj)) { - unsigned long long v = PyLong_AsUnsignedLongLong(obj); - if (!PyErr_Occurred()) { - if (val) *val = v; - return SWIG_OK; - } else { - PyErr_Clear(); - res = SWIG_OverflowError; - } - } else { - unsigned long v; - res = SWIG_AsVal_unsigned_SS_long (obj,&v); - if (SWIG_IsOK(res)) { - if (val) *val = v; - return res; - } - } -#ifdef SWIG_PYTHON_CAST_MODE - { - const double mant_max = 1LL << DBL_MANT_DIG; - double d; - res = SWIG_AsVal_double (obj,&d); - if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, mant_max)) { - if (val) *val = (unsigned long long)(d); - return SWIG_AddCast(res); - } - res = SWIG_TypeError; - } -#endif - return res; -} - SWIGINTERN CString CUser___str__(CUser *self){ return self->GetUserName(); } @@ -8261,22 +8423,11 @@ SWIGINTERN PyObject *SwigPyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_swig__SwigPyIterator, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } -SWIGINTERN PyObject *SHARED_PTR_DISOWN_swigconstant(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *module; - PyObject *d; - if (!PyArg_ParseTuple(args,(char*)"O:swigconstant", &module)) return NULL; - d = PyModule_GetDict(module); - if (!d) return NULL; - SWIG_Python_SetConstant(d, "SHARED_PTR_DISOWN",SWIG_From_int(static_cast< int >(0))); - return SWIG_Py_Void(); -} - - SWIGINTERN PyObject *_wrap__stringlist_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::list< CString > *arg1 = (std::list< CString > *) 0 ; @@ -10247,7 +10398,7 @@ SWIGINTERN PyObject *_stringlist_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__listT_CString_std__allocatorT_CString_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -12144,7 +12295,7 @@ SWIGINTERN PyObject *VIRCNetworks_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_CIRCNetwork_p_std__allocatorT_CIRCNetwork_p_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -14041,7 +14192,7 @@ SWIGINTERN PyObject *VChannels_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_CChan_p_std__allocatorT_CChan_p_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -15267,7 +15418,7 @@ SWIGINTERN PyObject *MNicks_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__mapT_CString_CNick_std__lessT_CString_t_std__allocatorT_std__pairT_CString_const_CNick_t_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -16275,7 +16426,7 @@ SWIGINTERN PyObject *SModInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__setT_CModInfo_std__lessT_CModInfo_t_std__allocatorT_CModInfo_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -17287,7 +17438,7 @@ SWIGINTERN PyObject *SCString_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__setT_CString_std__lessT_CString_t_std__allocatorT_CString_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -19235,7 +19386,7 @@ SWIGINTERN PyObject *VCString_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_CString_std__allocatorT_CString_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -20465,7 +20616,7 @@ SWIGINTERN PyObject *PyMCString_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__mapT_CString_CString_std__lessT_CString_t_std__allocatorT_std__pairT_CString_const_CString_t_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -21695,7 +21846,7 @@ SWIGINTERN PyObject *PyMStringVString_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__mapT_CString_std__vectorT_CString_std__allocatorT_CString_t_t_std__lessT_CString_t_std__allocatorT_std__pairT_CString_const_std__vectorT_CString_std__allocatorT_CString_t_t_t_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -21736,7 +21887,7 @@ SWIGINTERN PyObject *MCString_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_MCString, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -23633,7 +23784,7 @@ SWIGINTERN PyObject *PyModulesVector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_CModule_p_std__allocatorT_CModule_p_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -25530,7 +25681,7 @@ SWIGINTERN PyObject *VListeners_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_CListener_p_std__allocatorT_CListener_p_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -27448,7 +27599,7 @@ SWIGINTERN PyObject *BufLines_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__dequeT_CBufLine_std__allocatorT_CBufLine_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -29396,7 +29547,7 @@ SWIGINTERN PyObject *VVString_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__vectorT_CString_std__allocatorT_CString_t_t_std__allocatorT_std__vectorT_CString_std__allocatorT_CString_t_t_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -31293,7 +31444,7 @@ SWIGINTERN PyObject *VClients_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_CClient_p_std__allocatorT_CClient_p_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -32861,7 +33012,7 @@ SWIGINTERN PyObject *CUtils_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CUtils, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -32933,7 +33084,7 @@ SWIGINTERN PyObject *CException_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CException, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -33509,7 +33660,7 @@ SWIGINTERN PyObject *CTable_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CTable, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -33694,7 +33845,7 @@ SWIGINTERN PyObject *CConfigEntry_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CConfigEntry, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -35363,22 +35514,11 @@ SWIGINTERN PyObject *CConfig_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CConfig, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } -SWIGINTERN PyObject *CS_INVALID_SOCK_swigconstant(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *module; - PyObject *d; - if (!PyArg_ParseTuple(args,(char*)"O:swigconstant", &module)) return NULL; - d = PyModule_GetDict(module); - if (!d) return NULL; - SWIG_Python_SetConstant(d, "CS_INVALID_SOCK",SWIG_From_int(static_cast< int >(-1))); - return SWIG_Py_Void(); -} - - SWIGINTERN PyObject *_wrap_new_CSCharBuffer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; size_t arg1 ; @@ -35446,7 +35586,7 @@ SWIGINTERN PyObject *CSCharBuffer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CSCharBuffer, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -35708,7 +35848,7 @@ SWIGINTERN PyObject *CSSockAddr_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CSSockAddr, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -35851,7 +35991,7 @@ SWIGINTERN PyObject *CGetAddrInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CGetAddrInfo, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -36744,7 +36884,7 @@ SWIGINTERN PyObject *CCron_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CCron, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -37011,7 +37151,7 @@ SWIGINTERN PyObject *CSMonitorFD_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CSMonitorFD, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -37566,7 +37706,7 @@ SWIGINTERN PyObject *CSockCommon_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CSockCommon, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -42898,7 +43038,7 @@ SWIGINTERN PyObject *Csock_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_Csock, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -43452,7 +43592,7 @@ SWIGINTERN PyObject *CSConnection_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CSConnection, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -43621,7 +43761,7 @@ SWIGINTERN PyObject *CSSSLConnection_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CSSSLConnection, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -44253,7 +44393,7 @@ SWIGINTERN PyObject *CSListener_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CSListener, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -45659,7 +45799,7 @@ SWIGINTERN PyObject *CSocketManager_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CSocketManager, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -45869,7 +46009,7 @@ SWIGINTERN PyObject *ZNCSocketManager_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_TSocketManagerT_CZNCSock_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -46311,44 +46451,11 @@ SWIGINTERN PyObject *CZNCSock_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CZNCSock, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } -SWIGINTERN PyObject *ADDR_IPV4ONLY_swigconstant(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *module; - PyObject *d; - if (!PyArg_ParseTuple(args,(char*)"O:swigconstant", &module)) return NULL; - d = PyModule_GetDict(module); - if (!d) return NULL; - SWIG_Python_SetConstant(d, "ADDR_IPV4ONLY",SWIG_From_int(static_cast< int >(ADDR_IPV4ONLY))); - return SWIG_Py_Void(); -} - - -SWIGINTERN PyObject *ADDR_IPV6ONLY_swigconstant(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *module; - PyObject *d; - if (!PyArg_ParseTuple(args,(char*)"O:swigconstant", &module)) return NULL; - d = PyModule_GetDict(module); - if (!d) return NULL; - SWIG_Python_SetConstant(d, "ADDR_IPV6ONLY",SWIG_From_int(static_cast< int >(ADDR_IPV6ONLY))); - return SWIG_Py_Void(); -} - - -SWIGINTERN PyObject *ADDR_ALL_swigconstant(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *module; - PyObject *d; - if (!PyArg_ParseTuple(args,(char*)"O:swigconstant", &module)) return NULL; - d = PyModule_GetDict(module); - if (!d) return NULL; - SWIG_Python_SetConstant(d, "ADDR_ALL",SWIG_From_int(static_cast< int >(ADDR_ALL))); - return SWIG_Py_Void(); -} - - SWIGINTERN PyObject *_wrap_new_CSockManager(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CSockManager *result = 0 ; @@ -49698,7 +49805,7 @@ SWIGINTERN PyObject *CSockManager_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CSockManager, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -50920,7 +51027,7 @@ SWIGINTERN PyObject *CSocket_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CSocket, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -50961,7 +51068,7 @@ SWIGINTERN PyObject *CIRCSocket_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CIRCSocket, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -55332,7 +55439,7 @@ SWIGINTERN PyObject *CFile_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CFile, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -56393,7 +56500,7 @@ SWIGINTERN PyObject *CDir_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CDir, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -56604,7 +56711,7 @@ SWIGINTERN PyObject *CTimer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CTimer, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -56733,7 +56840,7 @@ SWIGINTERN PyObject *CFPTimer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CFPTimer, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -57505,7 +57612,7 @@ SWIGINTERN PyObject *CModInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CModInfo, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -57990,7 +58097,7 @@ SWIGINTERN PyObject *CModCommand_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CModCommand, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -65911,7 +66018,7 @@ SWIGINTERN PyObject *CModule_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CModule, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -71028,7 +71135,7 @@ SWIGINTERN PyObject *CModules_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CModules, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -71735,7 +71842,7 @@ SWIGINTERN PyObject *CNick_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CNick, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -74930,7 +75037,7 @@ SWIGINTERN PyObject *CChan_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CChan, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -80294,7 +80401,7 @@ SWIGINTERN PyObject *CUser_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CUser, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -85933,7 +86040,7 @@ SWIGINTERN PyObject *CIRCNetwork_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CIRCNetwork, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -86310,7 +86417,7 @@ SWIGINTERN PyObject *CAuthBase_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__shared_ptrT_CAuthBase_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -86534,7 +86641,7 @@ SWIGINTERN PyObject *CClientAuth_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__shared_ptrT_CClientAuth_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -88266,7 +88373,7 @@ SWIGINTERN PyObject *CClient_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CClient, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -89986,7 +90093,7 @@ SWIGINTERN PyObject *CIRCSock_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CIRCSock, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -90322,7 +90429,7 @@ SWIGINTERN PyObject *CListener_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CListener, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -90515,7 +90622,7 @@ SWIGINTERN PyObject *CRealListener_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CRealListener, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -90664,7 +90771,7 @@ SWIGINTERN PyObject *CIncomingConnection_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CIncomingConnection, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -93348,7 +93455,7 @@ SWIGINTERN PyObject *CHTTPSock_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CHTTPSock, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -93677,7 +93784,7 @@ SWIGINTERN PyObject *CTemplateTagHandler_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CTemplateTagHandler, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -93799,7 +93906,7 @@ SWIGINTERN PyObject *CTemplateOptions_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CTemplateOptions, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -94467,7 +94574,7 @@ SWIGINTERN PyObject *CTemplateLoopContext_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CTemplateLoopContext, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -96111,7 +96218,7 @@ SWIGINTERN PyObject *CTemplate_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CTemplate, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -96241,7 +96348,7 @@ SWIGINTERN PyObject *CZNCTagHandler_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CZNCTagHandler, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -96787,7 +96894,7 @@ SWIGINTERN PyObject *CWebSession_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__shared_ptrT_CWebSession_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -97382,7 +97489,7 @@ SWIGINTERN PyObject *CWebSubPage_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CWebSubPage, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -97513,7 +97620,7 @@ SWIGINTERN PyObject *CWebSessionMap_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CWebSessionMap, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -98392,7 +98499,7 @@ SWIGINTERN PyObject *CWebSock_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CWebSock, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -101991,7 +102098,7 @@ SWIGINTERN PyObject *CZNC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CZNC, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -102507,7 +102614,7 @@ SWIGINTERN PyObject *CServer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CServer, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -102616,7 +102723,7 @@ SWIGINTERN PyObject *CDebug_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CDebug, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -102657,7 +102764,7 @@ SWIGINTERN PyObject *CDebugStream_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CDebugStream, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -102876,7 +102983,7 @@ SWIGINTERN PyObject *CExecSock_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CExecSock, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -103349,7 +103456,7 @@ SWIGINTERN PyObject *CBufLine_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CBufLine, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -104414,7 +104521,7 @@ SWIGINTERN PyObject *CBuffer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CBuffer, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -104536,7 +104643,7 @@ SWIGINTERN PyObject *String_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_String, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -108453,7 +108560,7 @@ SWIGINTERN PyObject *CPyModule_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CPyModule, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -108718,7 +108825,7 @@ SWIGINTERN PyObject *CPyTimer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CPyTimer, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -109100,7 +109207,7 @@ SWIGINTERN PyObject *CPySocket_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CPySocket, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -109458,7 +109565,7 @@ SWIGINTERN PyObject *MCString_iter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_MCString_iter, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -109677,7 +109784,7 @@ SWIGINTERN PyObject *CModulesIter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CModulesIter, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -109786,7 +109893,7 @@ SWIGINTERN PyObject *CPyRetString_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CPyRetString, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -109888,14 +109995,14 @@ SWIGINTERN PyObject *CPyRetBool_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CPyRetBool, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } SWIGINTERN PyObject *CModPython_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CModPython, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -110164,7 +110271,7 @@ SWIGINTERN PyObject *StrPair_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__pairT_CString_CString_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -112112,7 +112219,7 @@ SWIGINTERN PyObject *VPair_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__pairT_CString_CString_t_std__allocatorT_std__pairT_CString_CString_t_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -114028,7 +114135,7 @@ SWIGINTERN PyObject *VWebSubPages_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__shared_ptrT_CWebSubPage_t_std__allocatorT_std__shared_ptrT_CWebSubPage_t_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -114176,7 +114283,6 @@ { (char *)"SwigPyIterator___add__", _wrap_SwigPyIterator___add__, METH_VARARGS, NULL}, { (char *)"SwigPyIterator___sub__", _wrap_SwigPyIterator___sub__, METH_VARARGS, NULL}, { (char *)"SwigPyIterator_swigregister", SwigPyIterator_swigregister, METH_VARARGS, NULL}, - { (char *)"SHARED_PTR_DISOWN_swigconstant", SHARED_PTR_DISOWN_swigconstant, METH_VARARGS, NULL}, { (char *)"_stringlist_iterator", _wrap__stringlist_iterator, METH_VARARGS, NULL}, { (char *)"_stringlist___nonzero__", _wrap__stringlist___nonzero__, METH_VARARGS, NULL}, { (char *)"_stringlist___bool__", _wrap__stringlist___bool__, METH_VARARGS, NULL}, @@ -114703,7 +114809,6 @@ { (char *)"new_CConfig", _wrap_new_CConfig, METH_VARARGS, NULL}, { (char *)"delete_CConfig", _wrap_delete_CConfig, METH_VARARGS, NULL}, { (char *)"CConfig_swigregister", CConfig_swigregister, METH_VARARGS, NULL}, - { (char *)"CS_INVALID_SOCK_swigconstant", CS_INVALID_SOCK_swigconstant, METH_VARARGS, NULL}, { (char *)"new_CSCharBuffer", _wrap_new_CSCharBuffer, METH_VARARGS, NULL}, { (char *)"delete_CSCharBuffer", _wrap_delete_CSCharBuffer, METH_VARARGS, NULL}, { (char *)"CSCharBuffer___call__", _wrap_CSCharBuffer___call__, METH_VARARGS, NULL}, @@ -114970,9 +115075,6 @@ { (char *)"CZNCSock_SetEncoding", _wrap_CZNCSock_SetEncoding, METH_VARARGS, NULL}, { (char *)"CZNCSock_GetRemoteIP", _wrap_CZNCSock_GetRemoteIP, METH_VARARGS, NULL}, { (char *)"CZNCSock_swigregister", CZNCSock_swigregister, METH_VARARGS, NULL}, - { (char *)"ADDR_IPV4ONLY_swigconstant", ADDR_IPV4ONLY_swigconstant, METH_VARARGS, NULL}, - { (char *)"ADDR_IPV6ONLY_swigconstant", ADDR_IPV6ONLY_swigconstant, METH_VARARGS, NULL}, - { (char *)"ADDR_ALL_swigconstant", ADDR_ALL_swigconstant, METH_VARARGS, NULL}, { (char *)"new_CSockManager", _wrap_new_CSockManager, METH_VARARGS, NULL}, { (char *)"delete_CSockManager", _wrap_delete_CSockManager, METH_VARARGS, NULL}, { (char *)"CSockManager_ListenHost", _wrap_CSockManager_ListenHost, METH_VARARGS, NULL}, @@ -117699,7 +117801,6 @@ static int type_init = 0; if (!type_init) { const PyTypeObject tmp = { - /* PyObject header changed in Python 3 */ #if PY_VERSION_HEX >= 0x03000000 PyVarObject_HEAD_INIT(NULL, 0) #else @@ -117931,13 +118032,13 @@ static PyGetSetDef thisown_getset_def = { (char *)"thisown", SwigPyBuiltin_GetterClosure, SwigPyBuiltin_SetterClosure, NULL, &thisown_getset_closure }; - PyObject *metatype_args; PyTypeObject *builtin_pytype; int builtin_base_count; swig_type_info *builtin_basetype; PyObject *tuple; PyGetSetDescrObject *static_getset; PyTypeObject *metatype; + PyTypeObject *swigpyobject; SwigPyClientData *cd; PyObject *public_interface, *public_symbol; PyObject *this_descr; @@ -117952,14 +118053,9 @@ (void)static_getset; (void)self; - /* metatype is used to implement static member variables. */ - metatype_args = Py_BuildValue("(s(O){})", "SwigPyObjectType", &PyType_Type); - assert(metatype_args); - metatype = (PyTypeObject *) PyType_Type.tp_call((PyObject *) &PyType_Type, metatype_args, NULL); + /* Metaclass is used to implement static member variables */ + metatype = SwigPyObjectType(); assert(metatype); - Py_DECREF(metatype_args); - metatype->tp_setattro = (setattrofunc) &SwigPyObjectType_setattro; - assert(PyType_Ready(metatype) >= 0); #endif /* Fix SwigMethods to carry the callback ptrs when needed */ @@ -117977,13 +118073,15 @@ SWIG_InitializeModule(0); #ifdef SWIGPYTHON_BUILTIN + swigpyobject = SwigPyObject_TypeOnce(); + SwigPyObject_stype = SWIG_MangledTypeQuery("_p_SwigPyObject"); assert(SwigPyObject_stype); cd = (SwigPyClientData*) SwigPyObject_stype->clientdata; if (!cd) { SwigPyObject_stype->clientdata = &SwigPyObject_clientdata; - SwigPyObject_clientdata.pytype = SwigPyObject_TypeOnce(); - } else if (SwigPyObject_TypeOnce()->tp_basicsize != cd->pytype->tp_basicsize) { + SwigPyObject_clientdata.pytype = swigpyobject; + } else if (swigpyobject->tp_basicsize != cd->pytype->tp_basicsize) { PyErr_SetString(PyExc_RuntimeError, "Import error: attempted to load two incompatible swig-generated modules."); # if PY_VERSION_HEX >= 0x03000000 return NULL; @@ -118014,14 +118112,16 @@ SWIG_InstallConstants(d,swig_const_table); - PyDict_SetItemString(md,(char*)"cvar", SWIG_globals()); - SWIG_addvarlink(SWIG_globals(),(char*)"g_HexDigits",Swig_var_g_HexDigits_get, Swig_var_g_HexDigits_set); - SWIG_addvarlink(SWIG_globals(),(char*)"CUtils_sDefaultHash",Swig_var_CUtils_sDefaultHash_get, Swig_var_CUtils_sDefaultHash_set); + SWIG_Python_SetConstant(d, "SHARED_PTR_DISOWN",SWIG_From_int(static_cast< int >(0))); + PyDict_SetItemString(md,(char *)"cvar", SWIG_globals()); + SWIG_addvarlink(SWIG_globals(),(char *)"g_HexDigits",Swig_var_g_HexDigits_get, Swig_var_g_HexDigits_set); + SWIG_addvarlink(SWIG_globals(),(char *)"CUtils_sDefaultHash",Swig_var_CUtils_sDefaultHash_get, Swig_var_CUtils_sDefaultHash_set); SWIG_Python_SetConstant(d, "CException_EX_Shutdown",SWIG_From_int(static_cast< int >(CException::EX_Shutdown))); SWIG_Python_SetConstant(d, "CException_EX_Restart",SWIG_From_int(static_cast< int >(CException::EX_Restart))); + SWIG_Python_SetConstant(d, "CS_INVALID_SOCK",SWIG_From_int(static_cast< int >(-1))); SWIG_Python_SetConstant(d, "CSSockAddr_RAF_ANY",SWIG_From_int(static_cast< int >(CSSockAddr::RAF_ANY))); SWIG_Python_SetConstant(d, "CSSockAddr_RAF_INET",SWIG_From_int(static_cast< int >(CSSockAddr::RAF_INET))); - SWIG_addvarlink(SWIG_globals(),(char*)"CS_BLOCKSIZE",Swig_var_CS_BLOCKSIZE_get, Swig_var_CS_BLOCKSIZE_set); + SWIG_addvarlink(SWIG_globals(),(char *)"CS_BLOCKSIZE",Swig_var_CS_BLOCKSIZE_get, Swig_var_CS_BLOCKSIZE_set); SWIG_Python_SetConstant(d, "Csock_OUTBOUND",SWIG_From_int(static_cast< int >(Csock::OUTBOUND))); SWIG_Python_SetConstant(d, "Csock_LISTENER",SWIG_From_int(static_cast< int >(Csock::LISTENER))); SWIG_Python_SetConstant(d, "Csock_INBOUND",SWIG_From_int(static_cast< int >(Csock::INBOUND))); @@ -118070,6 +118170,9 @@ SWIG_Python_SetConstant(d, "CSocketManager_SELECT_TRYAGAIN",SWIG_From_int(static_cast< int >(CSocketManager::SELECT_TRYAGAIN))); SWIG_Python_SetConstant(d, "CSocketManager_ECT_Read",SWIG_From_int(static_cast< int >(CSocketManager::ECT_Read))); SWIG_Python_SetConstant(d, "CSocketManager_ECT_Write",SWIG_From_int(static_cast< int >(CSocketManager::ECT_Write))); + SWIG_Python_SetConstant(d, "ADDR_IPV4ONLY",SWIG_From_int(static_cast< int >(ADDR_IPV4ONLY))); + SWIG_Python_SetConstant(d, "ADDR_IPV6ONLY",SWIG_From_int(static_cast< int >(ADDR_IPV6ONLY))); + SWIG_Python_SetConstant(d, "ADDR_ALL",SWIG_From_int(static_cast< int >(ADDR_ALL))); SWIG_Python_SetConstant(d, "CFile_FT_REGULAR",SWIG_From_int(static_cast< int >(CFile::FT_REGULAR))); SWIG_Python_SetConstant(d, "CFile_FT_DIRECTORY",SWIG_From_int(static_cast< int >(CFile::FT_DIRECTORY))); SWIG_Python_SetConstant(d, "CFile_FT_CHARACTER",SWIG_From_int(static_cast< int >(CFile::FT_CHARACTER))); diff -Nru znc-1.6.5/modules/modpython/znc_core.py znc-1.6.6/modules/modpython/znc_core.py --- znc-1.6.5/modules/modpython/znc_core.py 2017-03-12 21:01:17.000000000 +0000 +++ znc-1.6.6/modules/modpython/znc_core.py 2018-03-05 08:17:53.000000000 +0000 @@ -1,15 +1,22 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 3.0.8 +# Version 3.0.12 # # Do not make changes to this file unless you know what you are doing--modify # the SWIG interface file instead. - - - - -from sys import version_info -if version_info >= (2, 6, 0): +from sys import version_info as _swig_python_version_info +if _swig_python_version_info >= (2, 7, 0): + def swig_import_helper(): + import importlib + pkg = __name__.rpartition('.')[0] + mname = '.'.join((pkg, '_znc_core')).lstrip('.') + try: + return importlib.import_module(mname) + except ImportError: + return importlib.import_module('_znc_core') + _znc_core = swig_import_helper() + del swig_import_helper +elif _swig_python_version_info >= (2, 6, 0): def swig_import_helper(): from os.path import dirname import imp @@ -19,22 +26,27 @@ except ImportError: import _znc_core return _znc_core - if fp is not None: - try: - _mod = imp.load_module('_znc_core', fp, pathname, description) - finally: + try: + _mod = imp.load_module('_znc_core', fp, pathname, description) + finally: + if fp is not None: fp.close() - return _mod + return _mod _znc_core = swig_import_helper() del swig_import_helper else: import _znc_core -del version_info +del _swig_python_version_info + try: _swig_property = property except NameError: pass # Python < 2.2 doesn't have 'property'. +try: + import builtins as __builtin__ +except ImportError: + import __builtin__ def _swig_setattr_nondynamic(self, class_type, name, value, static=1): if (name == "thisown"): @@ -59,37 +71,30 @@ return _swig_setattr_nondynamic(self, class_type, name, value, 0) -def _swig_getattr_nondynamic(self, class_type, name, static=1): +def _swig_getattr(self, class_type, name): if (name == "thisown"): return self.this.own() method = class_type.__swig_getmethods__.get(name, None) if method: return method(self) - if (not static): - return object.__getattr__(self, name) - else: - raise AttributeError(name) - -def _swig_getattr(self, class_type, name): - return _swig_getattr_nondynamic(self, class_type, name, 0) + raise AttributeError("'%s' object has no attribute '%s'" % (class_type.__name__, name)) def _swig_repr(self): try: strthis = "proxy of " + self.this.__repr__() - except Exception: + except __builtin__.Exception: strthis = "" return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,) try: _object = object _newclass = 1 -except AttributeError: +except __builtin__.Exception: class _object: pass _newclass = 0 - import collections class SwigPyIterator(_object): __swig_setmethods__ = {} @@ -155,8 +160,6 @@ SwigPyIterator_swigregister = _znc_core.SwigPyIterator_swigregister SwigPyIterator_swigregister(SwigPyIterator) - -_znc_core.SHARED_PTR_DISOWN_swigconstant(_znc_core) SHARED_PTR_DISOWN = _znc_core.SHARED_PTR_DISOWN class _stringlist(collections.MutableSequence): __swig_setmethods__ = {} @@ -244,7 +247,7 @@ this = _znc_core.new__stringlist(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def push_back(self, x: 'std::list< CString >::value_type const &') -> "void": @@ -360,7 +363,7 @@ this = _znc_core.new_VIRCNetworks(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def push_back(self, x: 'CIRCNetwork') -> "void": @@ -473,7 +476,7 @@ this = _znc_core.new_VChannels(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def push_back(self, x: 'CChan') -> "void": @@ -574,7 +577,7 @@ this = _znc_core.new_MNicks(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def empty(self) -> "bool": @@ -667,7 +670,7 @@ this = _znc_core.new_SModInfo(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def empty(self) -> "bool": @@ -763,7 +766,7 @@ this = _znc_core.new_SCString(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def empty(self) -> "bool": @@ -901,7 +904,7 @@ this = _znc_core.new_VCString(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def push_back(self, x: 'std::vector< CString >::value_type const &') -> "void": @@ -1002,7 +1005,7 @@ this = _znc_core.new_PyMCString(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def empty(self) -> "bool": @@ -1121,7 +1124,7 @@ this = _znc_core.new_PyMStringVString(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def empty(self) -> "bool": @@ -1185,7 +1188,7 @@ this = _znc_core.new_MCString() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_MCString __del__ = lambda self: None @@ -1274,7 +1277,7 @@ this = _znc_core.new_PyModulesVector(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def push_back(self, x: 'CModule') -> "void": @@ -1387,7 +1390,7 @@ this = _znc_core.new_VListeners(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def push_back(self, x: 'CListener') -> "void": @@ -1500,7 +1503,7 @@ this = _znc_core.new_BufLines(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def push_back(self, x: 'CBufLine') -> "void": @@ -1617,7 +1620,7 @@ this = _znc_core.new_VVString(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def push_back(self, x: 'VCString') -> "void": @@ -1730,7 +1733,7 @@ this = _znc_core.new_VClients(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def push_back(self, x: 'CClient') -> "void": @@ -1776,79 +1779,102 @@ this = _znc_core.new_CUtils() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CUtils __del__ = lambda self: None - __swig_getmethods__["GetIP"] = lambda x: _znc_core.CUtils_GetIP if _newclass: GetIP = staticmethod(_znc_core.CUtils_GetIP) - __swig_getmethods__["GetLongIP"] = lambda x: _znc_core.CUtils_GetLongIP + else: + GetIP = _znc_core.CUtils_GetIP if _newclass: GetLongIP = staticmethod(_znc_core.CUtils_GetLongIP) - __swig_getmethods__["PrintError"] = lambda x: _znc_core.CUtils_PrintError + else: + GetLongIP = _znc_core.CUtils_GetLongIP if _newclass: PrintError = staticmethod(_znc_core.CUtils_PrintError) - __swig_getmethods__["PrintMessage"] = lambda x: _znc_core.CUtils_PrintMessage + else: + PrintError = _znc_core.CUtils_PrintError if _newclass: PrintMessage = staticmethod(_znc_core.CUtils_PrintMessage) - __swig_getmethods__["PrintPrompt"] = lambda x: _znc_core.CUtils_PrintPrompt + else: + PrintMessage = _znc_core.CUtils_PrintMessage if _newclass: PrintPrompt = staticmethod(_znc_core.CUtils_PrintPrompt) - __swig_getmethods__["PrintAction"] = lambda x: _znc_core.CUtils_PrintAction + else: + PrintPrompt = _znc_core.CUtils_PrintPrompt if _newclass: PrintAction = staticmethod(_znc_core.CUtils_PrintAction) - __swig_getmethods__["PrintStatus"] = lambda x: _znc_core.CUtils_PrintStatus + else: + PrintAction = _znc_core.CUtils_PrintAction if _newclass: PrintStatus = staticmethod(_znc_core.CUtils_PrintStatus) - __swig_getmethods__["GetSaltedHashPass"] = lambda x: _znc_core.CUtils_GetSaltedHashPass + else: + PrintStatus = _znc_core.CUtils_PrintStatus if _newclass: GetSaltedHashPass = staticmethod(_znc_core.CUtils_GetSaltedHashPass) - __swig_getmethods__["GetSalt"] = lambda x: _znc_core.CUtils_GetSalt + else: + GetSaltedHashPass = _znc_core.CUtils_GetSaltedHashPass if _newclass: GetSalt = staticmethod(_znc_core.CUtils_GetSalt) - __swig_getmethods__["SaltedMD5Hash"] = lambda x: _znc_core.CUtils_SaltedMD5Hash + else: + GetSalt = _znc_core.CUtils_GetSalt if _newclass: SaltedMD5Hash = staticmethod(_znc_core.CUtils_SaltedMD5Hash) - __swig_getmethods__["SaltedSHA256Hash"] = lambda x: _znc_core.CUtils_SaltedSHA256Hash + else: + SaltedMD5Hash = _znc_core.CUtils_SaltedMD5Hash if _newclass: SaltedSHA256Hash = staticmethod(_znc_core.CUtils_SaltedSHA256Hash) - __swig_getmethods__["GetPass"] = lambda x: _znc_core.CUtils_GetPass + else: + SaltedSHA256Hash = _znc_core.CUtils_SaltedSHA256Hash if _newclass: GetPass = staticmethod(_znc_core.CUtils_GetPass) - __swig_getmethods__["GetInput"] = lambda x: _znc_core.CUtils_GetInput + else: + GetPass = _znc_core.CUtils_GetPass if _newclass: GetInput = staticmethod(_znc_core.CUtils_GetInput) - __swig_getmethods__["GetBoolInput"] = lambda x: _znc_core.CUtils_GetBoolInput + else: + GetInput = _znc_core.CUtils_GetInput if _newclass: GetBoolInput = staticmethod(_znc_core.CUtils_GetBoolInput) - __swig_getmethods__["GetNumInput"] = lambda x: _znc_core.CUtils_GetNumInput + else: + GetBoolInput = _znc_core.CUtils_GetBoolInput if _newclass: GetNumInput = staticmethod(_znc_core.CUtils_GetNumInput) - __swig_getmethods__["GetMillTime"] = lambda x: _znc_core.CUtils_GetMillTime + else: + GetNumInput = _znc_core.CUtils_GetNumInput if _newclass: GetMillTime = staticmethod(_znc_core.CUtils_GetMillTime) - __swig_getmethods__["CTime"] = lambda x: _znc_core.CUtils_CTime + else: + GetMillTime = _znc_core.CUtils_GetMillTime if _newclass: CTime = staticmethod(_znc_core.CUtils_CTime) - __swig_getmethods__["FormatTime"] = lambda x: _znc_core.CUtils_FormatTime + else: + CTime = _znc_core.CUtils_CTime if _newclass: FormatTime = staticmethod(_znc_core.CUtils_FormatTime) - __swig_getmethods__["FormatServerTime"] = lambda x: _znc_core.CUtils_FormatServerTime + else: + FormatTime = _znc_core.CUtils_FormatTime if _newclass: FormatServerTime = staticmethod(_znc_core.CUtils_FormatServerTime) - __swig_getmethods__["GetTimezones"] = lambda x: _znc_core.CUtils_GetTimezones + else: + FormatServerTime = _znc_core.CUtils_FormatServerTime if _newclass: GetTimezones = staticmethod(_znc_core.CUtils_GetTimezones) - __swig_getmethods__["GetEncodings"] = lambda x: _znc_core.CUtils_GetEncodings + else: + GetTimezones = _znc_core.CUtils_GetTimezones if _newclass: GetEncodings = staticmethod(_znc_core.CUtils_GetEncodings) - __swig_getmethods__["GetMessageTags"] = lambda x: _znc_core.CUtils_GetMessageTags + else: + GetEncodings = _znc_core.CUtils_GetEncodings if _newclass: GetMessageTags = staticmethod(_znc_core.CUtils_GetMessageTags) - __swig_getmethods__["SetMessageTags"] = lambda x: _znc_core.CUtils_SetMessageTags + else: + GetMessageTags = _znc_core.CUtils_GetMessageTags if _newclass: SetMessageTags = staticmethod(_znc_core.CUtils_SetMessageTags) + else: + SetMessageTags = _znc_core.CUtils_SetMessageTags CUtils_swigregister = _znc_core.CUtils_swigregister CUtils_swigregister(CUtils) cvar = _znc_core.cvar @@ -1960,7 +1986,7 @@ this = _znc_core.new_CException(e) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CException __del__ = lambda self: None @@ -1981,7 +2007,7 @@ this = _znc_core.new_CTable(uPreferredWidth) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CTable __del__ = lambda self: None @@ -2023,7 +2049,7 @@ this = _znc_core.new_CConfigEntry(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CConfigEntry __del__ = lambda self: None @@ -2093,15 +2119,13 @@ this = _znc_core.new_CConfig() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CConfig __del__ = lambda self: None CConfig_swigregister = _znc_core.CConfig_swigregister CConfig_swigregister(CConfig) - -_znc_core.CS_INVALID_SOCK_swigconstant(_znc_core) CS_INVALID_SOCK = _znc_core.CS_INVALID_SOCK class CSCharBuffer(_object): __swig_setmethods__ = {} @@ -2114,7 +2138,7 @@ this = _znc_core.new_CSCharBuffer(iSize) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CSCharBuffer __del__ = lambda self: None @@ -2135,7 +2159,7 @@ this = _znc_core.new_CSSockAddr() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CSSockAddr __del__ = lambda self: None @@ -2182,7 +2206,7 @@ this = _znc_core.new_CGetAddrInfo(sHostname, pSock, csSockAddr) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CGetAddrInfo __del__ = lambda self: None @@ -2253,7 +2277,7 @@ this = _znc_core.new_CCron() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CCron __del__ = lambda self: None @@ -2317,7 +2341,7 @@ this = _znc_core.new_CSMonitorFD() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CSMonitorFD __del__ = lambda self: None @@ -2356,7 +2380,7 @@ this = _znc_core.new_CSockCommon() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CSockCommon __del__ = lambda self: None @@ -2408,7 +2432,7 @@ this = _znc_core.new_Csock(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def GetSockObj(self, sHostname: 'CString const &', iPort: 'uint16_t') -> "Csock *": @@ -2792,7 +2816,7 @@ this = _znc_core.new_CSConnection(sHostname, iPort, iTimeout) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CSConnection __del__ = lambda self: None @@ -2856,7 +2880,7 @@ this = _znc_core.new_CSSSLConnection(sHostname, iPort, iTimeout) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CSSSLConnection __del__ = lambda self: None @@ -2874,7 +2898,7 @@ this = _znc_core.new_CSListener(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CSListener __del__ = lambda self: None @@ -2944,7 +2968,7 @@ this = _znc_core.new_CSocketManager() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CSocketManager __del__ = lambda self: None @@ -3050,7 +3074,7 @@ this = _znc_core.new_ZNCSocketManager() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_ZNCSocketManager __del__ = lambda self: None @@ -3075,7 +3099,7 @@ this = _znc_core.new_CZNCSock(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CZNCSock __del__ = lambda self: None @@ -3100,14 +3124,8 @@ CZNCSock_swigregister = _znc_core.CZNCSock_swigregister CZNCSock_swigregister(CZNCSock) - -_znc_core.ADDR_IPV4ONLY_swigconstant(_znc_core) ADDR_IPV4ONLY = _znc_core.ADDR_IPV4ONLY - -_znc_core.ADDR_IPV6ONLY_swigconstant(_znc_core) ADDR_IPV6ONLY = _znc_core.ADDR_IPV6ONLY - -_znc_core.ADDR_ALL_swigconstant(_znc_core) ADDR_ALL = _znc_core.ADDR_ALL class CSockManager(ZNCSocketManager): __swig_setmethods__ = {} @@ -3124,7 +3142,7 @@ this = _znc_core.new_CSockManager() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CSockManager __del__ = lambda self: None @@ -3167,7 +3185,7 @@ this = _znc_core.new_CSocket(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CSocket __del__ = lambda self: None @@ -3207,7 +3225,7 @@ this = _znc_core.new_CIRCSocket() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CIRCSocket __del__ = lambda self: None @@ -3225,7 +3243,7 @@ this = _znc_core.new_CFile(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CFile __del__ = lambda self: None @@ -3260,51 +3278,64 @@ def IsSock(self, *args) -> "bool": return _znc_core.CFile_IsSock(self, *args) - __swig_getmethods__["FType"] = lambda x: _znc_core.CFile_FType if _newclass: FType = staticmethod(_znc_core.CFile_FType) + else: + FType = _znc_core.CFile_FType FA_Name = _znc_core.CFile_FA_Name FA_Size = _znc_core.CFile_FA_Size FA_ATime = _znc_core.CFile_FA_ATime FA_MTime = _znc_core.CFile_FA_MTime FA_CTime = _znc_core.CFile_FA_CTime FA_UID = _znc_core.CFile_FA_UID - __swig_getmethods__["Exists"] = lambda x: _znc_core.CFile_Exists if _newclass: Exists = staticmethod(_znc_core.CFile_Exists) - __swig_getmethods__["GetSize"] = lambda x: _znc_core.CFile_GetSize + else: + Exists = _znc_core.CFile_Exists if _newclass: GetSize = staticmethod(_znc_core.CFile_GetSize) - __swig_getmethods__["GetATime"] = lambda x: _znc_core.CFile_GetATime + else: + GetSize = _znc_core.CFile_GetSize if _newclass: GetATime = staticmethod(_znc_core.CFile_GetATime) - __swig_getmethods__["GetMTime"] = lambda x: _znc_core.CFile_GetMTime + else: + GetATime = _znc_core.CFile_GetATime if _newclass: GetMTime = staticmethod(_znc_core.CFile_GetMTime) - __swig_getmethods__["GetCTime"] = lambda x: _znc_core.CFile_GetCTime + else: + GetMTime = _znc_core.CFile_GetMTime if _newclass: GetCTime = staticmethod(_znc_core.CFile_GetCTime) - __swig_getmethods__["GetUID"] = lambda x: _znc_core.CFile_GetUID + else: + GetCTime = _znc_core.CFile_GetCTime if _newclass: GetUID = staticmethod(_znc_core.CFile_GetUID) - __swig_getmethods__["GetGID"] = lambda x: _znc_core.CFile_GetGID + else: + GetUID = _znc_core.CFile_GetUID if _newclass: GetGID = staticmethod(_znc_core.CFile_GetGID) - __swig_getmethods__["GetInfo"] = lambda x: _znc_core.CFile_GetInfo + else: + GetGID = _znc_core.CFile_GetGID if _newclass: GetInfo = staticmethod(_znc_core.CFile_GetInfo) - __swig_getmethods__["Delete"] = lambda x: _znc_core.CFile_Delete + else: + GetInfo = _znc_core.CFile_GetInfo if _newclass: Delete = staticmethod(_znc_core.CFile_Delete) - __swig_getmethods__["Move"] = lambda x: _znc_core.CFile_Move + else: + Delete = _znc_core.CFile_Delete if _newclass: Move = staticmethod(_znc_core.CFile_Move) - __swig_getmethods__["Copy"] = lambda x: _znc_core.CFile_Copy + else: + Move = _znc_core.CFile_Move if _newclass: Copy = staticmethod(_znc_core.CFile_Copy) - __swig_getmethods__["Chmod"] = lambda x: _znc_core.CFile_Chmod + else: + Copy = _znc_core.CFile_Copy if _newclass: Chmod = staticmethod(_znc_core.CFile_Chmod) + else: + Chmod = _znc_core.CFile_Chmod def Seek(self, uPos: 'off_t') -> "bool": return _znc_core.CFile_Seek(self, uPos) @@ -3362,12 +3393,14 @@ def ResetError(self) -> "void": return _znc_core.CFile_ResetError(self) - __swig_getmethods__["InitHomePath"] = lambda x: _znc_core.CFile_InitHomePath if _newclass: InitHomePath = staticmethod(_znc_core.CFile_InitHomePath) - __swig_getmethods__["GetHomePath"] = lambda x: _znc_core.CFile_GetHomePath + else: + InitHomePath = _znc_core.CFile_InitHomePath if _newclass: GetHomePath = staticmethod(_znc_core.CFile_GetHomePath) + else: + GetHomePath = _znc_core.CFile_GetHomePath CFile_swigregister = _znc_core.CFile_swigregister CFile_swigregister(CFile) @@ -3442,7 +3475,7 @@ this = _znc_core.new_CDir(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CDir __del__ = lambda self: None @@ -3467,18 +3500,22 @@ def IsDescending(self) -> "bool": return _znc_core.CDir_IsDescending(self) - __swig_getmethods__["CheckPathPrefix"] = lambda x: _znc_core.CDir_CheckPathPrefix if _newclass: CheckPathPrefix = staticmethod(_znc_core.CDir_CheckPathPrefix) - __swig_getmethods__["ChangeDir"] = lambda x: _znc_core.CDir_ChangeDir + else: + CheckPathPrefix = _znc_core.CDir_CheckPathPrefix if _newclass: ChangeDir = staticmethod(_znc_core.CDir_ChangeDir) - __swig_getmethods__["MakeDir"] = lambda x: _znc_core.CDir_MakeDir + else: + ChangeDir = _znc_core.CDir_ChangeDir if _newclass: MakeDir = staticmethod(_znc_core.CDir_MakeDir) - __swig_getmethods__["GetCWD"] = lambda x: _znc_core.CDir_GetCWD + else: + MakeDir = _znc_core.CDir_MakeDir if _newclass: GetCWD = staticmethod(_znc_core.CDir_GetCWD) + else: + GetCWD = _znc_core.CDir_GetCWD CDir_swigregister = _znc_core.CDir_swigregister CDir_swigregister(CDir) @@ -3513,7 +3550,7 @@ this = _znc_core.new_CTimer(pModule, uInterval, uCycles, sLabel, sDescription) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CTimer __del__ = lambda self: None @@ -3547,7 +3584,7 @@ this = _znc_core.new_CFPTimer(pModule, uInterval, uCycles, sLabel, sDescription) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CFPTimer __del__ = lambda self: None @@ -3571,7 +3608,7 @@ this = _znc_core.new_CModInfo(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CModInfo __del__ = lambda self: None @@ -3584,9 +3621,10 @@ def AddType(self, eType: 'CModInfo::EModuleType') -> "void": return _znc_core.CModInfo_AddType(self, eType) - __swig_getmethods__["ModuleTypeToString"] = lambda x: _znc_core.CModInfo_ModuleTypeToString if _newclass: ModuleTypeToString = staticmethod(_znc_core.CModInfo_ModuleTypeToString) + else: + ModuleTypeToString = _znc_core.CModInfo_ModuleTypeToString def GetName(self) -> "CString const &": return _znc_core.CModInfo_GetName(self) @@ -3653,11 +3691,12 @@ this = _znc_core.new_CModCommand(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this - __swig_getmethods__["InitHelp"] = lambda x: _znc_core.CModCommand_InitHelp if _newclass: InitHelp = staticmethod(_znc_core.CModCommand_InitHelp) + else: + InitHelp = _znc_core.CModCommand_InitHelp def AddHelp(self, Table: 'CTable') -> "void": return _znc_core.CModCommand_AddHelp(self, Table) @@ -3696,7 +3735,7 @@ this = _znc_core.new_CModule(pDLL, pUser, pNetwork, sModName, sDataDir) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CModule __del__ = lambda self: None @@ -3969,9 +4008,10 @@ def GetDLL(self) -> "ModHandle": return _znc_core.CModule_GetDLL(self) - __swig_getmethods__["GetCoreVersion"] = lambda x: _znc_core.CModule_GetCoreVersion if _newclass: GetCoreVersion = staticmethod(_znc_core.CModule_GetCoreVersion) + else: + GetCoreVersion = _znc_core.CModule_GetCoreVersion def PutIRC(self, sLine: 'CString const &') -> "bool": return _znc_core.CModule_PutIRC(self, sLine) @@ -4198,7 +4238,7 @@ this = _znc_core.new_CModules() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CModules __del__ = lambda self: None @@ -4445,24 +4485,30 @@ def ReloadModule(self, sModule: 'CString const &', sArgs: 'CString const &', pUser: 'CUser', pNetwork: 'CIRCNetwork', sRetMsg: 'CString &') -> "bool": return _znc_core.CModules_ReloadModule(self, sModule, sArgs, pUser, pNetwork, sRetMsg) - __swig_getmethods__["GetModInfo"] = lambda x: _znc_core.CModules_GetModInfo if _newclass: GetModInfo = staticmethod(_znc_core.CModules_GetModInfo) - __swig_getmethods__["GetModPathInfo"] = lambda x: _znc_core.CModules_GetModPathInfo + else: + GetModInfo = _znc_core.CModules_GetModInfo if _newclass: GetModPathInfo = staticmethod(_znc_core.CModules_GetModPathInfo) - __swig_getmethods__["GetAvailableMods"] = lambda x: _znc_core.CModules_GetAvailableMods + else: + GetModPathInfo = _znc_core.CModules_GetModPathInfo if _newclass: GetAvailableMods = staticmethod(_znc_core.CModules_GetAvailableMods) - __swig_getmethods__["GetDefaultMods"] = lambda x: _znc_core.CModules_GetDefaultMods + else: + GetAvailableMods = _znc_core.CModules_GetAvailableMods if _newclass: GetDefaultMods = staticmethod(_znc_core.CModules_GetDefaultMods) - __swig_getmethods__["FindModPath"] = lambda x: _znc_core.CModules_FindModPath + else: + GetDefaultMods = _znc_core.CModules_GetDefaultMods if _newclass: FindModPath = staticmethod(_znc_core.CModules_FindModPath) - __swig_getmethods__["GetModDirs"] = lambda x: _znc_core.CModules_GetModDirs + else: + FindModPath = _znc_core.CModules_FindModPath if _newclass: GetModDirs = staticmethod(_znc_core.CModules_GetModDirs) + else: + GetModDirs = _znc_core.CModules_GetModDirs def OnAddUser(self, User: 'CUser', sErrorRet: 'CString &') -> "bool": return _znc_core.CModules_OnAddUser(self, User, sErrorRet) @@ -4542,7 +4588,7 @@ this = _znc_core.new_CNick(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CNick __del__ = lambda self: None @@ -4639,7 +4685,7 @@ this = _znc_core.new_CChan(sName, pNetwork, bInConfig, pConfig) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CChan __del__ = lambda self: None @@ -4875,7 +4921,7 @@ this = _znc_core.new_CUser(sUserName) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CUser __del__ = lambda self: None @@ -4886,9 +4932,10 @@ HASH_MD5 = _znc_core.CUser_HASH_MD5 HASH_SHA256 = _znc_core.CUser_HASH_SHA256 HASH_DEFAULT = _znc_core.CUser_HASH_DEFAULT - __swig_getmethods__["SaltedHash"] = lambda x: _znc_core.CUser_SaltedHash if _newclass: SaltedHash = staticmethod(_znc_core.CUser_SaltedHash) + else: + SaltedHash = _znc_core.CUser_SaltedHash def ToConfig(self) -> "CConfig": return _znc_core.CUser_ToConfig(self) @@ -4904,12 +4951,14 @@ def IsValid(self, sErrMsg: 'CString &', bSkipPass: 'bool'=False) -> "bool": return _znc_core.CUser_IsValid(self, sErrMsg, bSkipPass) - __swig_getmethods__["IsValidUserName"] = lambda x: _znc_core.CUser_IsValidUserName if _newclass: IsValidUserName = staticmethod(_znc_core.CUser_IsValidUserName) - __swig_getmethods__["MakeCleanUserName"] = lambda x: _znc_core.CUser_MakeCleanUserName + else: + IsValidUserName = _znc_core.CUser_IsValidUserName if _newclass: MakeCleanUserName = staticmethod(_znc_core.CUser_MakeCleanUserName) + else: + MakeCleanUserName = _znc_core.CUser_MakeCleanUserName def GetModules(self, *args) -> "CModules const &": return _znc_core.CUser_GetModules(self, *args) @@ -5218,15 +5267,16 @@ __setattr__ = lambda self, name, value: _swig_setattr(self, CIRCNetwork, name, value) __swig_getmethods__ = {} __getattr__ = lambda self, name: _swig_getattr(self, CIRCNetwork, name) - __swig_getmethods__["IsValidNetwork"] = lambda x: _znc_core.CIRCNetwork_IsValidNetwork if _newclass: IsValidNetwork = staticmethod(_znc_core.CIRCNetwork_IsValidNetwork) + else: + IsValidNetwork = _znc_core.CIRCNetwork_IsValidNetwork def __init__(self, *args): this = _znc_core.new_CIRCNetwork(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CIRCNetwork __del__ = lambda self: None @@ -5588,7 +5638,7 @@ this = _znc_core.new_CClientAuth(pClient, sUsername, sPassword) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CClientAuth __del__ = lambda self: None @@ -5619,7 +5669,7 @@ this = _znc_core.new_CClient() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CClient __del__ = lambda self: None @@ -5659,9 +5709,10 @@ def HasSelfMessage(self) -> "bool": return _znc_core.CClient_HasSelfMessage(self) - __swig_getmethods__["IsValidIdentifier"] = lambda x: _znc_core.CClient_IsValidIdentifier if _newclass: IsValidIdentifier = staticmethod(_znc_core.CClient_IsValidIdentifier) + else: + IsValidIdentifier = _znc_core.CClient_IsValidIdentifier def UserCommand(self, sLine: 'CString &') -> "void": return _znc_core.CClient_UserCommand(self, sLine) @@ -5777,7 +5828,7 @@ this = _znc_core.new_CIRCSock(pNetwork) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CIRCSock __del__ = lambda self: None @@ -5911,9 +5962,10 @@ def ForwardRaw353(self, *args) -> "void": return _znc_core.CIRCSock_ForwardRaw353(self, *args) - __swig_getmethods__["IsFloodProtected"] = lambda x: _znc_core.CIRCSock_IsFloodProtected if _newclass: IsFloodProtected = staticmethod(_znc_core.CIRCSock_IsFloodProtected) + else: + IsFloodProtected = _znc_core.CIRCSock_IsFloodProtected CIRCSock_swigregister = _znc_core.CIRCSock_swigregister CIRCSock_swigregister(CIRCSock) @@ -5935,7 +5987,7 @@ this = _znc_core.new_CListener(uPort, sBindHost, sURIPrefix, bSSL, eAddr, eAccept) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CListener __del__ = lambda self: None @@ -5987,7 +6039,7 @@ this = _znc_core.new_CRealListener(listener) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CRealListener __del__ = lambda self: None @@ -6018,7 +6070,7 @@ this = _znc_core.new_CIncomingConnection(sHostname, uPort, eAcceptType, sURIPrefix) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CIncomingConnection __del__ = lambda self: None @@ -6094,18 +6146,20 @@ def PrintErrorPage(self, uStatusId: 'unsigned int', sStatusMsg: 'CString const &', sMessage: 'CString const &') -> "bool": return _znc_core.CHTTPSock_PrintErrorPage(self, uStatusId, sStatusMsg, sMessage) - __swig_getmethods__["ParseParams"] = lambda x: _znc_core.CHTTPSock_ParseParams if _newclass: ParseParams = staticmethod(_znc_core.CHTTPSock_ParseParams) + else: + ParseParams = _znc_core.CHTTPSock_ParseParams def ParseURI(self) -> "void": return _znc_core.CHTTPSock_ParseURI(self) def GetPage(self) -> "void": return _znc_core.CHTTPSock_GetPage(self) - __swig_getmethods__["GetDate"] = lambda x: _znc_core.CHTTPSock_GetDate if _newclass: GetDate = staticmethod(_znc_core.CHTTPSock_GetDate) + else: + GetDate = _znc_core.CHTTPSock_GetDate def GetRemoteIP(self) -> "CString": return _znc_core.CHTTPSock_GetRemoteIP(self) @@ -6185,7 +6239,7 @@ this = _znc_core.new_CTemplateTagHandler() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CTemplateTagHandler __del__ = lambda self: None @@ -6215,7 +6269,7 @@ this = _znc_core.new_CTemplateOptions() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CTemplateOptions __del__ = lambda self: None @@ -6242,7 +6296,7 @@ this = _znc_core.new_CTemplateLoopContext(uFilePos, sLoopName, bReverse, pRows) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CTemplateLoopContext __del__ = lambda self: None @@ -6312,7 +6366,7 @@ this = _znc_core.new_CTemplate(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CTemplate __del__ = lambda self: None @@ -6418,7 +6472,7 @@ this = _znc_core.new_CZNCTagHandler(pWebSock) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CZNCTagHandler __del__ = lambda self: None @@ -6439,7 +6493,7 @@ this = _znc_core.new_CWebSession(sId, sIP) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CWebSession __del__ = lambda self: None @@ -6493,7 +6547,7 @@ this = _znc_core.new_CWebSubPage(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CWebSubPage __del__ = lambda self: None @@ -6533,7 +6587,7 @@ this = _znc_core.new_CWebSessionMap(uTTL) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def FinishUserSessions(self, User: 'CUser') -> "void": @@ -6562,7 +6616,7 @@ this = _znc_core.new_CWebSock(sURIPrefix) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CWebSock __del__ = lambda self: None @@ -6590,9 +6644,10 @@ def GetSockObj(self, sHost: 'CString const &', uPort: 'unsigned short') -> "Csock *": return _znc_core.CWebSock_GetSockObj(self, sHost, uPort) - __swig_getmethods__["GetSkinPath"] = lambda x: _znc_core.CWebSock_GetSkinPath if _newclass: GetSkinPath = staticmethod(_znc_core.CWebSock_GetSkinPath) + else: + GetSkinPath = _znc_core.CWebSock_GetSkinPath def GetAvailSkins(self, vRet: 'VCString') -> "void": return _znc_core.CWebSock_GetAvailSkins(self, vRet) @@ -6605,9 +6660,10 @@ def SendCookie(self, sKey: 'CString const &', sValue: 'CString const &') -> "bool": return _znc_core.CWebSock_SendCookie(self, sKey, sValue) - __swig_getmethods__["FinishUserSessions"] = lambda x: _znc_core.CWebSock_FinishUserSessions if _newclass: FinishUserSessions = staticmethod(_znc_core.CWebSock_FinishUserSessions) + else: + FinishUserSessions = _znc_core.CWebSock_FinishUserSessions CWebSock_swigregister = _znc_core.CWebSock_swigregister CWebSock_swigregister(CWebSock) @@ -6630,7 +6686,7 @@ this = _znc_core.new_CZNC() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CZNC __del__ = lambda self: None @@ -6683,15 +6739,18 @@ def BackupConfigOnce(self, sSuffix: 'CString const &') -> "void": return _znc_core.CZNC_BackupConfigOnce(self, sSuffix) - __swig_getmethods__["GetVersion"] = lambda x: _znc_core.CZNC_GetVersion if _newclass: GetVersion = staticmethod(_znc_core.CZNC_GetVersion) - __swig_getmethods__["GetTag"] = lambda x: _znc_core.CZNC_GetTag + else: + GetVersion = _znc_core.CZNC_GetVersion if _newclass: GetTag = staticmethod(_znc_core.CZNC_GetTag) - __swig_getmethods__["GetCompileOptionsString"] = lambda x: _znc_core.CZNC_GetCompileOptionsString + else: + GetTag = _znc_core.CZNC_GetTag if _newclass: GetCompileOptionsString = staticmethod(_znc_core.CZNC_GetCompileOptionsString) + else: + GetCompileOptionsString = _znc_core.CZNC_GetCompileOptionsString def GetUptime(self) -> "CString": return _znc_core.CZNC_GetUptime(self) @@ -6836,15 +6895,18 @@ def GetDisabledSSLProtocols(self) -> "Csock::EDisableProtocol": return _znc_core.CZNC_GetDisabledSSLProtocols(self) - __swig_getmethods__["CreateInstance"] = lambda x: _znc_core.CZNC_CreateInstance if _newclass: CreateInstance = staticmethod(_znc_core.CZNC_CreateInstance) - __swig_getmethods__["Get"] = lambda x: _znc_core.CZNC_Get + else: + CreateInstance = _znc_core.CZNC_CreateInstance if _newclass: Get = staticmethod(_znc_core.CZNC_Get) - __swig_getmethods__["DestroyInstance"] = lambda x: _znc_core.CZNC_DestroyInstance + else: + Get = _znc_core.CZNC_Get if _newclass: DestroyInstance = staticmethod(_znc_core.CZNC_DestroyInstance) + else: + DestroyInstance = _znc_core.CZNC_DestroyInstance def FindUser(self, sUsername: 'CString const &') -> "CUser *": return _znc_core.CZNC_FindUser(self, sUsername) @@ -6911,9 +6973,10 @@ def LeakConnectQueueTimer(self, pTimer: 'CConnectQueueTimer *') -> "void": return _znc_core.CZNC_LeakConnectQueueTimer(self, pTimer) - __swig_getmethods__["DumpConfig"] = lambda x: _znc_core.CZNC_DumpConfig if _newclass: DumpConfig = staticmethod(_znc_core.CZNC_DumpConfig) + else: + DumpConfig = _znc_core.CZNC_DumpConfig def GetUserMap_(self) -> "PyObject *": return _znc_core.CZNC_GetUserMap_(self) @@ -6959,7 +7022,7 @@ this = _znc_core.new_CServer(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CServer __del__ = lambda self: None @@ -6978,9 +7041,10 @@ def GetString(self, bIncludePassword: 'bool'=True) -> "CString": return _znc_core.CServer_GetString(self, bIncludePassword) - __swig_getmethods__["IsValidHostName"] = lambda x: _znc_core.CServer_IsValidHostName if _newclass: IsValidHostName = staticmethod(_znc_core.CServer_IsValidHostName) + else: + IsValidHostName = _znc_core.CServer_IsValidHostName CServer_swigregister = _znc_core.CServer_swigregister CServer_swigregister(CServer) @@ -6994,24 +7058,28 @@ __swig_getmethods__ = {} __getattr__ = lambda self, name: _swig_getattr(self, CDebug, name) __repr__ = _swig_repr - __swig_getmethods__["SetStdoutIsTTY"] = lambda x: _znc_core.CDebug_SetStdoutIsTTY if _newclass: SetStdoutIsTTY = staticmethod(_znc_core.CDebug_SetStdoutIsTTY) - __swig_getmethods__["StdoutIsTTY"] = lambda x: _znc_core.CDebug_StdoutIsTTY + else: + SetStdoutIsTTY = _znc_core.CDebug_SetStdoutIsTTY if _newclass: StdoutIsTTY = staticmethod(_znc_core.CDebug_StdoutIsTTY) - __swig_getmethods__["SetDebug"] = lambda x: _znc_core.CDebug_SetDebug + else: + StdoutIsTTY = _znc_core.CDebug_StdoutIsTTY if _newclass: SetDebug = staticmethod(_znc_core.CDebug_SetDebug) - __swig_getmethods__["Debug"] = lambda x: _znc_core.CDebug_Debug + else: + SetDebug = _znc_core.CDebug_SetDebug if _newclass: Debug = staticmethod(_znc_core.CDebug_Debug) + else: + Debug = _znc_core.CDebug_Debug def __init__(self): this = _znc_core.new_CDebug() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CDebug __del__ = lambda self: None @@ -7047,7 +7115,7 @@ this = _znc_core.new_CDebugStream() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this CDebugStream_swigregister = _znc_core.CDebugStream_swigregister CDebugStream_swigregister(CDebugStream) @@ -7067,7 +7135,7 @@ this = _znc_core.new_CExecSock() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def Execute(self, sExec: 'CString const &') -> "int": @@ -7097,7 +7165,7 @@ this = _znc_core.new_CBufLine(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CBufLine __del__ = lambda self: None @@ -7139,7 +7207,7 @@ this = _znc_core.new_CBuffer(uLineCount) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_CBuffer __del__ = lambda self: None @@ -7194,7 +7262,7 @@ this = _znc_core.new_String() try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_destroy__ = _znc_core.delete_String __del__ = lambda self: None @@ -7216,7 +7284,7 @@ this = _znc_core.new_CPyModule(pUser, pNetwork, sModName, sDataPath, pyObj, pModPython) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def GetPyObj(self) -> "PyObject *": @@ -7504,7 +7572,7 @@ this = _znc_core.new_CPyTimer(pModule, uInterval, uCycles, sLabel, sDescription, pyObj) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def RunJob(self) -> "void": @@ -7539,7 +7607,7 @@ this = _znc_core.new_CPySocket(pModule, pyObj) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def GetPyObj(self) -> "PyObject *": @@ -7624,7 +7692,7 @@ this = _znc_core.new_MCString_iter(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def plusplus(self) -> "void": @@ -7651,7 +7719,7 @@ this = _znc_core.new_CModulesIter(pModules) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def plusplus(self) -> "void": @@ -7744,7 +7812,7 @@ this = _znc_core.new_StrPair(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this __swig_setmethods__["first"] = _znc_core.StrPair_first_set __swig_getmethods__["first"] = _znc_core.StrPair_first_get @@ -7859,7 +7927,7 @@ this = _znc_core.new_VPair(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def push_back(self, x: 'StrPair') -> "void": @@ -7976,7 +8044,7 @@ this = _znc_core.new_VWebSubPages(*args) try: self.this.append(this) - except Exception: + except __builtin__.Exception: self.this = this def push_back(self, x: 'std::vector< std::shared_ptr< CWebSubPage > >::value_type const &') -> "void": diff -Nru znc-1.6.5/src/Utils.cpp znc-1.6.6/src/Utils.cpp --- znc-1.6.5/src/Utils.cpp 2017-03-12 21:00:58.000000000 +0000 +++ znc-1.6.6/src/Utils.cpp 2018-03-05 08:17:38.000000000 +0000 @@ -31,6 +31,10 @@ #include #include +#ifdef HAVE_TCSETATTR +#include +#endif + #ifdef HAVE_ICU #include #include @@ -112,7 +116,6 @@ X509_NAME_add_entry_by_txt(pName, "CN", MBSTRING_ASC, (unsigned char *)pHostName, -1, -1, 0); X509_NAME_add_entry_by_txt(pName, "emailAddress", MBSTRING_ASC, (unsigned char *)sEmailAddr.c_str(), -1, -1, 0); - X509_set_subject_name(pCert.get(), pName); X509_set_issuer_name(pCert.get(), pName); if (!X509_sign(pCert.get(), pKey.get(), EVP_sha256())) @@ -197,12 +200,29 @@ } CString CUtils::GetPass(const CString& sPrompt) { +#ifdef HAVE_TCSETATTR + // Disable echo + struct termios t; + tcgetattr(1, &t); + struct termios t2 = t; + t2.c_lflag &= ~ECHO; + tcsetattr(1, TCSANOW, &t2); + // Read pass + CString r; + GetInput(sPrompt, r); + // Restore echo and go to new line + tcsetattr(1, TCSANOW, &t); + fprintf(stdout, "\n"); + fflush(stdout); + return r; +#else PrintPrompt(sPrompt); #ifdef HAVE_GETPASSPHRASE return getpassphrase(""); #else return getpass(""); #endif +#endif } bool CUtils::GetBoolInput(const CString& sPrompt, bool bDefault) {