Hello community, here is the log from the commit of package smpppd checked in at Tue Sep 16 16:56:08 CEST 2008. -------- --- smpppd/smpppd.changes 2008-09-11 17:07:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/smpppd/smpppd.changes 2008-09-16 16:08:33.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 16 16:08:01 CEST 2008 - lnussel@suse.de + +- add support for IPv6 + +------------------------------------------------------------------- Old: ---- smpppd-1.59_SVN28.tar.bz2 New: ---- smpppd-1.59_SVN30.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smpppd.spec ++++++ --- /var/tmp/diff_new_pack.q23304/_old 2008-09-16 16:55:52.000000000 +0200 +++ /var/tmp/diff_new_pack.q23304/_new 2008-09-16 16:55:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package smpppd (Version 1.59_SVN28) +# spec file for package smpppd (Version 1.59_SVN30) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Group: Productivity/Networking/PPP Summary: SuSE Meta PPP Daemon Requires: ppp /usr/bin/killall -Version: 1.59_SVN28 +Version: 1.59_SVN30 Release: 1 Source0: smpppd-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,6 +45,11 @@ %prep %setup -q +%if 0 +if [ -e $RPM_SOURCE_DIR/devel.diff ]; then + patch -p1 < $RPM_SOURCE_DIR/devel.diff +fi +%endif %build export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -102,6 +107,8 @@ %{restart_on_update smpppd} %changelog +* Tue Sep 16 2008 lnussel@suse.de +- add support for IPv6 * Thu Sep 11 2008 lnussel@suse.de - use PolicyKit instead of dialout group to check access - support plain chat instead of wvdial, making wvdial optional ++++++ smpppd-1.59_SVN28.tar.bz2 -> smpppd-1.59_SVN30.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smpppd-1.59_SVN28/configure new/smpppd-1.59_SVN30/configure --- old/smpppd-1.59_SVN28/configure 2008-09-11 17:05:23.000000000 +0200 +++ new/smpppd-1.59_SVN30/configure 2008-09-16 16:07:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for smpppd 1.59_SVN28. +# Generated by GNU Autoconf 2.61 for smpppd 1.59_SVN30. # # Report bugs to http://developer.novell.com/wiki/index.php/Smpppd. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='smpppd' PACKAGE_TARNAME='smpppd' -PACKAGE_VERSION='1.59_SVN28' -PACKAGE_STRING='smpppd 1.59_SVN28' +PACKAGE_VERSION='1.59_SVN30' +PACKAGE_STRING='smpppd 1.59_SVN30' PACKAGE_BUGREPORT='http://developer.novell.com/wiki/index.php/Smpppd' ac_unique_file="smpppd/smpppd.cc" @@ -1224,7 +1224,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 smpppd 1.59_SVN28 to adapt to many kinds of systems. +\`configure' configures smpppd 1.59_SVN30 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1290,7 +1290,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of smpppd 1.59_SVN28:";; + short | recursive ) echo "Configuration of smpppd 1.59_SVN30:";; esac cat <<\_ACEOF @@ -1387,7 +1387,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -smpppd configure 1.59_SVN28 +smpppd configure 1.59_SVN30 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1401,7 +1401,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by smpppd $as_me 1.59_SVN28, which was +It was created by smpppd $as_me 1.59_SVN30, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2094,7 +2094,7 @@ # Define the identity of the package. PACKAGE='smpppd' - VERSION='1.59_SVN28' + VERSION='1.59_SVN30' cat >>confdefs.h <<_ACEOF @@ -5615,7 +5615,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by smpppd $as_me 1.59_SVN28, which was +This file was extended by smpppd $as_me 1.59_SVN30, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5668,7 +5668,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -smpppd config.status 1.59_SVN28 +smpppd config.status 1.59_SVN30 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smpppd-1.59_SVN28/smpppd/connection.cc new/smpppd-1.59_SVN30/smpppd/connection.cc --- old/smpppd-1.59_SVN28/smpppd/connection.cc 2008-04-25 14:58:49.000000000 +0200 +++ new/smpppd-1.59_SVN30/smpppd/connection.cc 2008-09-16 16:07:14.000000000 +0200 @@ -50,6 +50,7 @@ } num_links = 0; + num_protocols = 0; pppd_ifname = ""; @@ -501,4 +502,89 @@ return string ("local:") + vhex; } + +void +Connection::analyse_pppd_output (const string& line) +{ + dprintf ("*** %s ***\n", line.c_str ()); + + if (line == "Starting link") { + logit (true, "Establishing connection due to activity."); + status = CONNECTING; + num_links = 1; + status_callback (); + return; + } + + if (startswith (line, "Script /etc/ppp/ip-up finished") + || startswith (line, "Script /etc/ppp/ipv6-up finished")) { + if (!endswith (line, "status = 0x0")) + logit (true, "The ip-up script returned an error. " + "Your connection may not work."); + if(!num_protocols++) { + status = CONNECTED; + num_links = 1; + status_callback (); + accounting_up (0); // FIXME + } + if (config->demand && config->modify_dns && config->auto_dns) + dns_keep (); + return; + } + + if (startswith (line, "Script /etc/ppp/ip-down finished") + || startswith (line, "Script /etc/ppp/ipv6-down finished")) { + if (!endswith (line, "status = 0x0")) + logit (true, "The ip-down script returned an error."); + + if(num_protocols > 0 && !--num_protocols) { + status = config->demand ? LURKING : DISCONNECTED; + num_links = 0; + status_callback (); + accounting_down (0); // FIXME + if (!config->demand) { + // needed for !demand && persist + pppstat.reset (); + rx_bytes = tx_bytes = 0; + } + } + return; + } + + if (line == "Terminating connection due to lack of activity.") { + logit (true, "The connection was idle and shut down."); + status = DISCONNECTING; + status_callback (); + return; + } + + if (line == "PAP authentication failed" || + line == "CHAP authentication failed") { + logit (true, "Authentication error. Maybe bad account " + "or password."); + return; + } + + if (line == "Timeout waiting for PADO packets") { + logit (true, "Timeout Waiting for PADO packets. Check your setup and " + "cables and try again."); + return; + } + + if (line == "Terminating on signal 15.") { + if (status != LURKING) { + status = DISCONNECTING; + status_callback (); + } + return; + } + + if (startswith (line, "Using interface ")) { + pppd_ifname = line.substr (16, string::npos); + status_callback (); + return; + } +} + + #undef EP_SIZE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smpppd-1.59_SVN28/smpppd/connection.h new/smpppd-1.59_SVN30/smpppd/connection.h --- old/smpppd-1.59_SVN28/smpppd/connection.h 2008-04-25 14:58:49.000000000 +0200 +++ new/smpppd-1.59_SVN30/smpppd/connection.h 2008-09-16 16:07:14.000000000 +0200 @@ -102,6 +102,9 @@ int num_links; + /* number of protocols that are up (ipv4, ipv6)*/ + unsigned num_protocols; + string pppd_ifname; /* adds persistent-name options to the pppd */ @@ -142,6 +145,8 @@ const string user; + virtual void analyse_pppd_output (const string&); + private: Connection (const Connection&); // disallow diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smpppd-1.59_SVN28/smpppd/dsl.cc new/smpppd-1.59_SVN30/smpppd/dsl.cc --- old/smpppd-1.59_SVN28/smpppd/dsl.cc 2008-04-25 14:58:49.000000000 +0200 +++ new/smpppd-1.59_SVN30/smpppd/dsl.cc 2008-09-16 16:07:14.000000000 +0200 @@ -345,79 +345,15 @@ void -DSL::analyse (const string& line) +DSL::analyse_pppd_output (const string& line) { - dprintf ("*** %s ***\n", line.c_str ()); - - if (line == "Starting link") { - logit (true, "Establishing connection due to activity."); - status = CONNECTING; - num_links = 1; - status_callback (); - return; - } - - if (startswith (line, "Script /etc/ppp/ip-up finished")) { - if (!endswith (line, "status = 0x0")) - logit (true, "The ip-up script returned an error. " - "Your connection may not work."); - status = CONNECTED; - num_links = 1; - status_callback (); - accounting_up (0); // FIXME - if (dslconfig->demand && dslconfig->modify_dns && dslconfig->auto_dns) - dns_keep (); - return; - } - - if (startswith (line, "Script /etc/ppp/ip-down finished")) { - if (!endswith (line, "status = 0x0")) - logit (true, "The ip-down script returned an error."); - status = dslconfig->demand ? LURKING : DISCONNECTED; - num_links = 0; - status_callback (); - accounting_down (0); // FIXME - if (!dslconfig->demand) { - // needed for !demand && persist - pppstat.reset (); - rx_bytes = tx_bytes = 0; - } - return; - } - - if (line == "Terminating connection due to lack of activity.") { - logit (true, "The connection was idle and shut down."); - status = DISCONNECTING; - status_callback (); - return; - } - - if (line == "PAP authentication failed" || - line == "CHAP authentication failed") { - logit (true, "Authentication error. Maybe bad account " - "or password."); - return; - } + Connection::analyse_pppd_output(line); if (line == "Timeout waiting for PADO packets") { logit (true, "Timeout Waiting for PADO packets. Check your setup and " "cables and try again."); return; } - - if (line == "Terminating on signal 15.") { - if (status != LURKING) { - status = DISCONNECTING; - status_callback (); - } - return; - } - - if (startswith (line, "Using interface ")) { - pppd_ifname = line.substr (16, string::npos); - status_callback (); - return; - } } @@ -439,7 +375,7 @@ string tmp; while (pppd_log->read_line (tmp)) { logit (false, "pppd[0]: %s", tmp.c_str ()); - analyse (tmp); + analyse_pppd_output (tmp); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smpppd-1.59_SVN28/smpppd/dsl.h new/smpppd-1.59_SVN30/smpppd/dsl.h --- old/smpppd-1.59_SVN28/smpppd/dsl.h 2008-01-31 16:33:12.000000000 +0100 +++ new/smpppd-1.59_SVN30/smpppd/dsl.h 2008-09-16 16:07:14.000000000 +0200 @@ -45,7 +45,7 @@ Process pppd; Stream* pppd_log; - void analyse (const string&); + void analyse_pppd_output (const string&); DSL (const DSL&); // disallow DSL& operator = (const DSL&); // disallow diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smpppd-1.59_SVN28/smpppd/isdn.cc new/smpppd-1.59_SVN30/smpppd/isdn.cc --- old/smpppd-1.59_SVN28/smpppd/isdn.cc 2008-04-25 14:58:49.000000000 +0200 +++ new/smpppd-1.59_SVN30/smpppd/isdn.cc 2008-09-16 16:07:14.000000000 +0200 @@ -351,71 +351,9 @@ void -ISDN::analyse (const string& line) +ISDN::analyse_pppd_output (const string& line) { - dprintf ("*** %s ***\n", line.c_str ()); - - if (line == "Starting link") { - logit (true, "Establishing connection due to activity."); - status = CONNECTING; - num_links = 1; - status_callback (); - return; - } - - if (startswith (line, "Script /etc/ppp/ip-up finished")) { - if (!endswith (line, "status = 0x0")) - logit (true, "The ip-up script returned an error. " - "Your connection may not work."); - status = CONNECTED; - num_links = 1; - status_callback (); - accounting_up (0); // FIXME - return; - } - - if (startswith (line, "Script /etc/ppp/ip-down finished")) { - if (!endswith (line, "status = 0x0")) - logit (true, "The ip-down script returned an error."); - status = isdnconfig->demand ? LURKING : DISCONNECTED; - num_links = 0; - status_callback (); - accounting_down (0); // FIXME - if (!isdnconfig->demand) { - // needed for !demand && persist - pppstat.reset (); - rx_bytes = tx_bytes = 0; - } - return; - } - - if (line == "Terminating connection due to lack of activity.") { - logit (true, "The connection was idle and shut down."); - status = DISCONNECTING; - status_callback (); - return; - } - - if (line == "PAP authentication failed" || - line == "CHAP authentication failed") { - logit (true, "Authentication error. Maybe bad account " - "or password."); - return; - } - - if (line == "Terminating on signal 15.") { - if (status != LURKING) { - status = DISCONNECTING; - status_callback (); - } - return; - } - - if (startswith (line, "Using interface ")) { - pppd_ifname = line.substr (16, string::npos); - status_callback (); - return; - } + Connection::analyse_pppd_output(line); if (startswith (line, "Link attached to ")) { logit (true, "Oops, pppd[0] attached to some interface. Very bad!"); @@ -437,7 +375,7 @@ void -ISDN::sanalyse (const string& line) +ISDN::analyse_2nd_pppd_output (const string& line) { dprintf ("*** %s ***\n", line.c_str ()); @@ -494,7 +432,7 @@ string tmp; while (pppd_log->read_line (tmp)) { logit (false, "pppd[0]: %s", tmp.c_str ()); - analyse (tmp); + analyse_pppd_output (tmp); } } @@ -505,7 +443,7 @@ string tmp; while (spppd_log->read_line (tmp)) { logit (false, "pppd[1]: %s", tmp.c_str ()); - sanalyse (tmp); + analyse_2nd_pppd_output (tmp); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smpppd-1.59_SVN28/smpppd/isdn.h new/smpppd-1.59_SVN30/smpppd/isdn.h --- old/smpppd-1.59_SVN28/smpppd/isdn.h 2008-01-31 16:33:12.000000000 +0100 +++ new/smpppd-1.59_SVN30/smpppd/isdn.h 2008-09-16 16:07:14.000000000 +0200 @@ -48,8 +48,8 @@ Process spppd; Stream* spppd_log; - void analyse (const string&); - void sanalyse (const string&); + void analyse_pppd_output (const string&); + void analyse_2nd_pppd_output (const string&); ISDN (const ISDN&); // disallow ISDN& operator = (const ISDN&); // disallow diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smpppd-1.59_SVN28/smpppd/modem.cc new/smpppd-1.59_SVN30/smpppd/modem.cc --- old/smpppd-1.59_SVN28/smpppd/modem.cc 2008-09-11 17:05:03.000000000 +0200 +++ new/smpppd-1.59_SVN30/smpppd/modem.cc 2008-09-16 16:07:14.000000000 +0200 @@ -403,77 +403,6 @@ void -Modem::analyse (const string& line) -{ - dprintf ("*** %s ***\n", line.c_str ()); - - if (line == "Starting link") { - logit (true, "Establishing connection due to activity."); - status = CONNECTING; - num_links = 1; - status_callback (); - return; - } - - if (startswith (line, "Script /etc/ppp/ip-up finished")) { - if (!endswith (line, "status = 0x0")) - logit (true, "The ip-up script returned an error. " - "Your connection may not work."); - status = CONNECTED; - num_links = 1; - status_callback (); - accounting_up (0); // FIXME - if (modemconfig->demand && modemconfig->modify_dns && modemconfig->auto_dns) - dns_keep (); - return; - } - - if (startswith (line, "Script /etc/ppp/ip-down finished")) { - if (!endswith (line, "status = 0x0")) - logit (true, "The ip-down script returned an error."); - status = modemconfig->demand ? LURKING : DISCONNECTED; - num_links = 0; - status_callback (); - accounting_down (0); // FIXME - if (!modemconfig->demand) { - // needed for !demand && persist - pppstat.reset (); - rx_bytes = tx_bytes = 0; - } - return; - } - - if (line == "Terminating connection due to lack of activity.") { - logit (true, "The connection was idle and shut down."); - status = DISCONNECTING; - status_callback (); - return; - } - - if (line == "PAP authentication failed" || - line == "CHAP authentication failed") { - logit (true, "Authentication error. Maybe bad account " - "or password."); - return; - } - - if (line == "Terminating on signal 15.") { - if (status != LURKING) { - status = DISCONNECTING; - status_callback (); - } - return; - } - - if (startswith (line, "Using interface ")) { - pppd_ifname = line.substr (16, string::npos); - status_callback (); - return; - } -} - - -void Modem::prepare_fdset (FDSet* fdset) const { if (pppd_log) @@ -491,7 +420,7 @@ string tmp; while (pppd_log->read_line (tmp)) { logit (false, "pppd[0]: %s", tmp.c_str ()); - analyse (tmp); + analyse_pppd_output (tmp); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smpppd-1.59_SVN28/smpppd/modem.h new/smpppd-1.59_SVN30/smpppd/modem.h --- old/smpppd-1.59_SVN28/smpppd/modem.h 2008-09-11 17:05:03.000000000 +0200 +++ new/smpppd-1.59_SVN30/smpppd/modem.h 2008-09-16 16:07:14.000000000 +0200 @@ -42,8 +42,6 @@ const ModemConfig* modemconfig; - void analyse (const string&); - bool write_wvdial (); bool write_chat (); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org