Fix on PPP PCO length and charging characteristics required flag.

2 files changed, 18 insertions, 11 deletions

diff --git a/configure b/configure
index 757a50c..dc463a1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for openggsn 0.81.
+# Generated by GNU Autoconf 2.57 for openggsn 0.82.
 #
 # Report bugs to <jj@openggsn.org>.
 #
@@ -427,8 +427,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='openggsn'
 PACKAGE_TARNAME='openggsn'
-PACKAGE_VERSION='0.81'
-PACKAGE_STRING='openggsn 0.81'
+PACKAGE_VERSION='0.82'
+PACKAGE_STRING='openggsn 0.82'
 PACKAGE_BUGREPORT='jj@openggsn.org'
 
 ac_unique_file="gtp/gtp.c"
@@ -946,7 +946,7 @@ if test "$ac_init_help" = "long"; then
   # 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 openggsn 0.81 to adapt to many kinds of systems.
+\`configure' configures openggsn 0.82 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1012,7 +1012,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of openggsn 0.81:";;
+     short | recursive ) echo "Configuration of openggsn 0.82:";;
    esac
   cat <<\_ACEOF
 
@@ -1110,7 +1110,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-openggsn configure 0.81
+openggsn configure 0.82
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1125,7 +1125,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by openggsn $as_me 0.81, which was
+It was created by openggsn $as_me 0.82, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
@@ -9398,7 +9398,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=openggsn
- VERSION=0.81
+ VERSION=0.82
 
 
 cat >>confdefs.h <<_ACEOF
@@ -10032,7 +10032,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by openggsn $as_me 0.81, which was
+This file was extended by openggsn $as_me 0.82, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10098,7 +10098,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-openggsn config.status 0.81
+openggsn config.status 0.82
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c
index 9bc576e..388f736 100644
--- a/sgsnemu/sgsnemu.c
+++ b/sgsnemu/sgsnemu.c
@@ -473,7 +473,7 @@ int process_options(int argc, char **argv) {
   options.pco.v[0] = 0x80; /* PPP */
   options.pco.v[1] = 0xc0; /* PAP */
   options.pco.v[2] = 0x23; 
-  options.pco.v[3] = 0x12; /* Length of protocol contents */
+  options.pco.v[3] = strlen(args_info.uid_arg) + strlen(args_info.pwd_arg) + 6;
   options.pco.v[4] = 0x01; /* Authenticate request */
   options.pco.v[5] = 0x01;
   options.pco.v[6] = 0x00; /* MSB of length */
@@ -1168,6 +1168,13 @@ int main(int argc, char **argv)
     pdp->hisaddr0 = options.remote;
     pdp->hisaddr1 = options.remote;
 
+    /* TODO: This could be an option */
+    pdp->cch_pdp = 2048; /* Normal charging 3GPP 32.015 */
+                         /* 2048 = Normal
+			    1024 = Prepaid
+			    0512 = Flat rate
+			    0256 = Hot billing */
+
     /* Create context */
     /* We send this of once. Retransmissions are handled by gtplib */
     gtp_create_context_req(gsn, pdp, &iparr[n]);