diff -Naur ns-3.23/AUTHORS ns-3.24/AUTHORS --- ns-3.23/AUTHORS 2015-05-13 11:05:26.000000000 -0700 +++ ns-3.24/AUTHORS 2015-09-15 11:18:44.000000000 -0700 @@ -82,6 +82,7 @@ Joe Kopena (tjkopena@cs.drexel.edu) Christopher Kosecki (christopher.l.kosecki.ctr@mail.mil) Aleksey Kovalenko (kovalenko@iitp.ru) +Alexander Krotov (ilabdsf@yandex.ru) Mathieu Lacage (mathieu.lacage@inria.fr) Emmanuelle Laprise (emmmanuelle.laprise@bluekazoo.ca) Kristijan Lenković (k.lenkovic@me.com) @@ -100,6 +101,7 @@ Jonathan McCrohan (jmccroha@tcd.ie) Andrew McGregor (andrewmcgr@gmail.com) Vedran Miletić (rivanvx@gmail.com) +Saswat Mishra (clicksaswat@gmail.com) Jens Mittag (jens.mittag@kit.edu) Marco Miozzo (mmiozzo@cttc.es) Faker Moatamri (faker.moatamri@inria.fr) @@ -111,6 +113,7 @@ Hemanth Narra (hemanth@ittc.ku.edu) Roman Naumann (naumann@informatik.hu-berlin.de) Ben Newton (bn@cs.unc.edu) +Cecchi Niccolò (insa@igeek.it) Andreas Nilsson (andrnils@gmail.com) Jaume Nin (jnin@cttc.es) Michael Nowatkowski (nowatkom@gmail.com) @@ -127,6 +130,7 @@ Colin Perkins (csp@csperkins.org) Giuseppe Piro (g.piro@poliba.it) Yana Podkosova (yanapdk@rambler.ru) +Ovidiu Poncea (ovidiu.poncea@cs.pub.ro) Vikas Pushkar (vikaskupushkar@gmail.com) Andrea Ranieri (andreran@uno.it) Bruno Ranieri (Yrrsinn@googlemail.com) @@ -143,6 +147,7 @@ Lynne Salameh (l.salameh@cs.ucl.ac.uk) Providence Salumu Munga (Providence.Salumu@gmail.com, Providence.Salumu_Munga@it-sudparis.eu) Francisco Javier Sánchez-Roselly (fnavarro@ujaen.es) +Siddharth Santurkar (siddharth.santurkar@ieee.org) Florian Schmidt (Florian.Schmidt@cs.rwth-aachen.de) Guillaume Seguin (guillaume.seguin@inria.fr) Ioannis Selinis (selinis.g@gmail.com) @@ -159,6 +164,7 @@ YunQiang Su (wzssyqa@gmail.com) Brian Swenson (bswenson3@gatech.edu) Lalith Suresh (suresh.lalith@gmail.com) +Mohit P. Tahiliani (tahiliani.nitk@gmail.com) Dave Taht (dave.taht@bufferbloat.net) Marcos Talau (talau@users.sourceforge.net) Adrian S. W. Tam (adrian.sw.tam@gmail.com) diff -Naur ns-3.23/bindings/python/wscript ns-3.24/bindings/python/wscript --- ns-3.23/bindings/python/wscript 2015-05-13 11:05:26.000000000 -0700 +++ ns-3.24/bindings/python/wscript 2015-09-15 11:18:44.000000000 -0700 @@ -1,4 +1,5 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- +from __future__ import print_function import types import re import os @@ -12,12 +13,25 @@ # feature = TaskGen.feature # after = TaskGen.after -## https://launchpad.net/pybindgen/ -REQUIRED_PYBINDGEN_VERSION = (0, 17, 0, 886) +# https://github.com/gjcarneiro/pybindgen +REQUIRED_PYBINDGEN_VERSION = '0.17.0.post41+ngd10fa60' REQUIRED_PYGCCXML_VERSION = (0, 9, 5) RUN_ME=-3 +# return types of some APIs differ in Python 2/3 (type string vs class bytes) +# This method will decode('utf-8') a byte object in Python 3, +# and do nothing in Python 2 +def maybe_decode(input): + if sys.version_info < (3,): + return input + else: + try: + return input.decode('utf-8') + except: + sys.exc_clear() + return input + def add_to_python_path(path): if os.environ.get('PYTHONPATH', ''): os.environ['PYTHONPATH'] = path + os.pathsep + os.environ.get('PYTHONPATH') @@ -88,19 +102,19 @@ try: conf.load('python') - except Errors.ConfigurationError, ex: + except Errors.ConfigurationError as ex: conf.report_optional_feature("python", "Python Bindings", False, "The python interpreter was not found") return try: conf.check_python_version((2,3)) - except Errors.ConfigurationError, ex: + except Errors.ConfigurationError as ex: conf.report_optional_feature("python", "Python Bindings", False, "The python found version is too low (2.3 required)") return try: conf.check_python_headers() - except Errors.ConfigurationError, ex: + except Errors.ConfigurationError as ex: conf.report_optional_feature("python", "Python Bindings", False, "Python library or headers missing") return @@ -165,15 +179,13 @@ else: out = subprocess.Popen([conf.env['PYTHON'][0], "-c", "import pybindgen.version; " - "print('.'.join([str(x) for x in pybindgen.version.__version__]))"], + "print(pybindgen.__version__)"], stdout=subprocess.PIPE).communicate()[0] - pybindgen_version_str = out.strip() - pybindgen_version = tuple([int(x) for x in pybindgen_version_str.split('.')]) - conf.msg('Checking for pybindgen version', pybindgen_version_str) + pybindgen_version = maybe_decode(out.strip()) + conf.msg('Checking for pybindgen version', pybindgen_version) if not (pybindgen_version == REQUIRED_PYBINDGEN_VERSION): - Logs.warn("pybindgen (found %s), (need %s)" % - (pybindgen_version_str, - '.'.join([str(x) for x in REQUIRED_PYBINDGEN_VERSION]))) + Logs.warn("pybindgen (found %r), (need %r)" % + (pybindgen_version, REQUIRED_PYBINDGEN_VERSION)) conf.report_optional_feature("python", "Python Bindings", False, "PyBindGen version not correct and newer version could not be retrieved") return @@ -192,13 +204,11 @@ ''' % dict(type1=t1, type2=t2) try: - ret = conf.run_c_code(code=test_program, - env=conf.env.derive(), compile_filename='test.cc', - features='cxx cprogram', execute=False) + ret = conf.check(compiler='cxx', fragment=test_program, features='cxx') except Errors.ConfigurationError: - ret = 1 + ret = False conf.msg('Checking for types %s and %s equivalence' % (t1, t2), (ret and 'no' or 'yes')) - return not ret + return ret uint64_is_long = test("uint64_t", "unsigned long") uint64_is_long_long = test("uint64_t", "unsigned long long") @@ -280,13 +290,17 @@ "gccxml missing") return - gccxml_version_line = os.popen(gccxml + " --version").readline().strip() + gccxml_version_line = os.popen(gccxml[0] + " --version").readline().strip() m = re.match( "^GCC-XML version (\d\.\d(\.\d)?)$", gccxml_version_line) - gccxml_version = m.group(1) - gccxml_version_ok = ([int(s) for s in gccxml_version.split('.')] >= [0, 9]) + try: + gccxml_version = m.group(1) + gccxml_version_ok = ([int(s) for s in gccxml_version.split('.')] >= [0, 9]) + except AttributeError: + gccxml_version = gccxml_version_line + gccxml_version_ok = False conf.msg('Checking for gccxml version', gccxml_version) if not gccxml_version_ok: - Logs.warn("gccxml too old, need version >= 0.9; automatic scanning of API definitions will not be possible") + Logs.warn("gccxml version unknown or too old, need version >= 0.9; automatic scanning of API definitions will not be possible") conf.report_optional_feature("pygccxml", "Python API Scanning Support", False, "gccxml too old") return @@ -414,13 +428,13 @@ def run(self): assert len(self.outputs) == 1 - outfile = file(self.outputs[0].abspath(), "w") - print >> outfile, "import warnings" - print >> outfile, 'warnings.warn("the ns3 module is a compatibility layer '\ - 'and should not be used in newly written code", DeprecationWarning, stacklevel=2)' - print >> outfile + outfile = open(self.outputs[0].abspath(), "w") + print("import warnings", file=outfile) + print('warnings.warn("the ns3 module is a compatibility layer '\ + 'and should not be used in newly written code", DeprecationWarning, stacklevel=2)', file=outfile) + print(file=outfile) for module in self.bld.env['PYTHON_MODULES_BUILT']: - print >> outfile, "from ns.%s import *" % (module.replace('-', '_')) + print("from ns.%s import *" % (module.replace('-', '_')), file=outfile) outfile.close() return 0 @@ -466,7 +480,7 @@ scan_modules.append(mod.name.split('ns3-')[1]) else: scan_modules = Options.options.apiscan.split(',') - print "Modules to scan: ", scan_modules + print("Modules to scan: ", scan_modules) for target, cflags in scan_targets: group = bld.get_group(bld.current_group) for module in scan_modules: @@ -488,4 +502,3 @@ # note: the actual build commands for the python bindings are in # src/wscript, not here. - diff -Naur ns-3.23/CHANGES.html ns-3.24/CHANGES.html --- ns-3.23/CHANGES.html 2015-05-13 11:05:26.000000000 -0700 +++ ns-3.24/CHANGES.html 2015-09-15 11:18:44.000000000 -0700 @@ -51,6 +51,47 @@ us a note on ns-developers mailing list.

+

Changes from ns-3.23 to ns-3.24

+

New API:

+ +

Changes to existing API:

+ +

Changes to build system:

+ +

Changed behavior:

+This section is for behavioral changes to the models that were not due to a bug fix. + + +

Changes from ns-3.22 to ns-3.23

New API: