Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nsnam/ns-3-dev-git
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: whitefield-framework/ns-3-dev-git
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 1,641 files changed
  • 1 contributor

Commits on Apr 21, 2017

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2a4a49a View commit details

Commits on Sep 11, 2017

  1. Copy the full SHA
    6f89cce View commit details

Commits on Sep 25, 2017

  1. Copy the full SHA
    9f08ecc View commit details

Commits on Feb 7, 2018

  1. enable only lr-wpan module

    nyrahul committed Feb 7, 2018
    Copy the full SHA
    0c99ee6 View commit details

Commits on Mar 4, 2018

  1. Copy the full SHA
    3a14d33 View commit details

Commits on Apr 6, 2018

  1. Copy the full SHA
    eeafd44 View commit details
  2. Merge pull request #2 from whitefield-framework/openthread_mac_support

    added new apis needed for openthread
    nyrahul authored Apr 6, 2018
    Copy the full SHA
    d1f05d3 View commit details

Commits on Aug 11, 2018

  1. ext mode addressing

    nyrahul committed Aug 11, 2018
    Copy the full SHA
    436895b View commit details

Commits on Aug 25, 2019

  1. Copy the full SHA
    ab9d741 View commit details

Commits on Jul 5, 2020

  1. added PLC submodule

    nyrahul committed Jul 5, 2020
    Copy the full SHA
    e8e9372 View commit details
  2. added PLC submodule

    nyrahul committed Jul 5, 2020
    Copy the full SHA
    1ce4523 View commit details
Showing 1,641 changed files with 188,430 additions and 121,658 deletions.
53 changes: 53 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
---
Language: Cpp
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlinesLeft: true
AlignOperands: true
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: AllDefinitions
AlwaysBreakTemplateDeclarations: true
BinPackArguments: true
BinPackParameters: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Custom
BraceWrapping:
AfterClass: true
AfterControlStatement: true
AfterFunction: true
AfterNamespace: false
AfterStruct: true
IndentBraces: true
BeforeElse: true
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
ColumnLimit: 100
ConstructorInitializerAllOnOneLineOrOnePerLine: true
Cpp11BracedListStyle: true
DerivePointerAlignment: false
IndentCaseLabels: false
IndentWidth: 2
NamespaceIndentation: None
PointerAlignment: Right
ReflowComments: false
SortIncludes: false
SpaceAfterCStyleCast: true
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: Always
SpaceInEmptyParentheses: false
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: 'Cpp11'
UseTab: Never
...
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
src/*/bindings/* linguist-generated=true

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -35,3 +35,5 @@ TAGS

build-dir/
build/
/.cproject
/.project
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "src/plc"]
path = src/plc
url = https://github.com/nyrahul/plc.git
branch = master
2 changes: 2 additions & 0 deletions .hgtags
Original file line number Diff line number Diff line change
@@ -74,3 +74,5 @@ fa4be182ef17746cea50e89af557c79a28b76533 ns-3.21
e8634b0101f7be773074f6e42587fa4a6d0563ba ns-3.24
3316e06767e7e6db79bb0bd537af8acb582c8e7d ns-3.25
0287b775fa6c203283a3809ba846992e37e469fb ns-3.26
68978885b6fc333757fb013ddb0179d29fff9972 ns-3.27
82d130348a364f8c32a176aae67de84325767cd1 ns-3.28
1 change: 1 addition & 0 deletions .lvimrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set ts=2 sw=2
13 changes: 13 additions & 0 deletions .ns3rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#! /usr/bin/env python

# A list of the modules that will be enabled when ns-3 is run.
# Modules that depend on the listed modules will be enabled also.
#
# All modules can be enabled by choosing 'all_modules'.
modules_enabled = ['lr-wpan', 'plc', 'bridge']

# Set this equal to true if you want examples to be run.
examples_enabled = True

# Set this equal to true if you want tests to be run.
tests_enabled = False
32 changes: 32 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "(gdb) Launch from scratch",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/build/scratch/${fileBasenameNoExtension}",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [
{
"name": "LD_LIBRARY_PATH",
"value": "./build/lib/"
}
],
"externalConsole": true,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
}
]
}
25 changes: 25 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "Build",
"type": "shell",
"command": "./waf",
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "Run tests",
"type": "shell",
"command": "./test.py",
"group": {
"kind": "test",
"isDefault": true
}
}
]
}
37 changes: 33 additions & 4 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
John Abraham (john.abraham.in@gmail.com)
Danilo Abrignani (dabrignani@gmail.com)
Alexander Afanasyev (alexander.afanasyev@ucla.edu)
Rohit Agarwal (mindprince@gmail.com)
Piyush Aggarwal (piyush8311@gmail.com)
Zoraze Ali (zoraze.ali@cttc.es)
Robert Ammon (ammo6818@vandals.uidaho.edu)
Kirill Andreev (andreev@iitp.ru)
Dean Armstrong (deanarm@gmail.com)
Stefano Avallone (stefano.avallone@unina.it)
@@ -27,6 +30,7 @@ Scott Carpenter (scarpen@ncsu.edu)
Tiago Cerqueira (tiago.miguel43@gmail.com)
Egemen K. Cetinkaya (ekc@iitc.ku.edu)
Angelos Chatzipapas (chatzipa@ceid.upatras.gr)
Luciano Jerez Chaves (ljerezchaves@gmail.com)
Eugene Chemeritskiy (echemeritskiy@arccn.ru)
Yufei Cheng (yfcheng@ittc.ku.edu)
Andrey Churin (aachurin@gmail.com)
@@ -38,8 +42,10 @@ Matthieu Coudron (matthieu.coudron@lip6.fr)
Alexander D'souza (moijes12@gmail.com)
Ankit Deepak (adadeepak8@gmail.com)
Sébastien Deronne (sebastien.deronne@gmail.com)
Christoph Döpmann (doepmanc@informatik.hu-berlin.de)
Craig Dowell (craigdo@ee.washington.edu)
Gilaras Drakeson (gilaras@gmail.com)
Mathias Ettinger (mettinger@toulouse.viveris.com)
Christian Facchini (c.facchini@gmail.com)
Denis Fakhriev (fakhriev@iitp.ru)
Jahanzeb Farooq (Jahanzeb.Farooq@inria.fr, Jahanzeb.Farooq@gmail.com)
@@ -53,12 +59,13 @@ Yida Gao (yidapb@gmail.com)
Thomas Geithner (thomas.geithner@dai-labor.de)
Ashim Ghosh (ashim.atiit@gmail.com)
Martin Giachino (martin.giachino@gmail.com,giachino@fing.edu.uy)
Nichit Bodhak Goel (nichit93@gmail.com)
Tom Goff (tgoff@tgoff.net)
Mohit Goyal (mohit.bits@gmail.com)
Juan C. Granda (jcgranda@uniovi.es)
David Gross (gdavid.devel@gmail.com)
Maja Grubišić (maja.grubisic@live.com)
Federico Guerra <federico@guerra-tlc.com>
Federico Guerra (federico@guerra-tlc.com)
Charline Taibi Guguen (charline.guguen@gmail.com)
Daniel Halperin (daniel@halper.in)
Bruno Haick (bghaick@hotmail.com)
@@ -74,16 +81,20 @@ Blake Hurd (naimorai@gmail.com)
Pasquale Imputato (p.imputato@gmail.com)
ishan (ishan.chhabra@gmail.com)
Mohamed Amine Ismail (amine.ismail@inria.fr, iamine@udcast.com)
Toshio Ito (debug.ito@gmail.com)
Jared Ivey (j.ivey@gatech.edu)
Atishay Jain (atishayjain25@gmail.com)
Sascha Alexander Jopen (jopen@informatik.uni-bonn.de)
Sourabh Jain (jainsourabh679@gmail.com)
Vivek Jain (jain.vivek.anand@gmail.com)
Sam Jansen (sam.jansen@gmail.com)
Liu Jian (liujatp@gmail.com)
Sascha Alexander Jopen (jopen@informatik.uni-bonn.de)
Piotr Jurkiewicz (piotr.jerzy.jurkiewicz@gmail.com)
Evgeny Kalishenko (ydginster@gmail.com)
Tanmay Kathpalia (tanmay.kathpalia@landisgyr.com)
Konstantinos Katsaros (dinos.katsaros@gmail.com)
Morteza Kheirkhah (m.kheirkhah@sussex.ac.uk)
Shravya Ks (shravya.ks0@gmail.com)
Flavio Kubota (flaviokubota@gmail.com)
Joe Kopena (tjkopena@cs.drexel.edu)
Christopher Kosecki (christopher.l.kosecki.ctr@mail.mil)
@@ -99,18 +110,22 @@ Björn Lichtblau (lichtbla@informatik.hu-berlin.de)
Timo Lindhorst (tlnd@online.de)
Erwan Livolant (erwan.livolant@inria.fr)
Andrea Lupia (alupia@dimes.unical.it)
Radu Lupu (rlupu@elcom.pub.ro)
Keith Ma (keith.nwsuaf@gmail.com)
Federico Maguolo (maguolof@dei.unipd.it)
Antti Makela (zarhan@cc.hut.fi)
Francesco Malandrino (francesco.malandrino@gmail.com)
Rubén Martínez (rmartinez@deic.uab.cat)
Ryan Mast (mast9@llnl.gov)
Fabian Mauchle (f1mauchl@hsr.ch)
Andrey Mazo (mazo@iitp.ru)
Jonathan McCrohan (jmccroha@tcd.ie)
Andrew McGregor (andrewmcgr@gmail.com)
Miralem Mehic (miralemmehic@gmail.com)
Vedran Miletić (rivanvx@gmail.com)
Saswat Mishra (clicksaswat@gmail.com)
Jens Mittag (jens.mittag@kit.edu)
Viyom Mittal (viyommittal@gmail.com)
Marco Miozzo (mmiozzo@cttc.es)
Faker Moatamri (faker.moatamri@inria.fr)
Edvin Močibob (edvin.mocibob@gmail.com)
@@ -130,6 +145,7 @@ Anh Nguyen (annguyen@ittc.ku.edu)
Duy Nguyen (duy@soe.ucsc.edu)
Luis Pacheco (luisbelem@gmail.com)
Lluís Parcerisa (parcerisa@gmail.com)
Mingyu Park (darkpmg@naver.com)
Natale Patriciello (natale.patriciello@gmail.com)
Tommaso Pecorella (tommaso.pecorella@unifi.it)
Guangyu Pei (guangyu.pei@boeing.com)
@@ -140,26 +156,36 @@ Colin Perkins (csp@csperkins.org)
Giuseppe Piro (g.piro@poliba.it)
Randall Plate (rplate@spawar.navy.mil)
Yana Podkosova (yanapdk@rambler.ru)
Michele Polese (michele.polese@gmail.com)
Ovidiu Poncea (ovidiu.poncea@cs.pub.ro)
Vikas Pushkar (vikaskupushkar@gmail.com)
Manoj Kumar Rana (manoj24.rana@gmail.com)
Andrea Ranieri (andreran@uno.it)
Bruno Ranieri (Yrrsinn@googlemail.com)
Deepti Rajagopal (deeptir96@gmail.com)
Varun Reddy (varunamarreddy@gmail.com)
Ken Renard (kenneth.renard@arl.army.mil)
Getachew Redieteab (getachew.redieteab@orange.com)
Manuel Requena (mrequena@cttc.es)
Jakub Rewienski (jrewienski@gmail.com)
Matias Richart (mrichart@fing.edu.uy)
George F. Riley (riley@ece.gatech.edu)
Juergen Rinas (jrinas@gmx.de)
Sebastian Rohde (sebastian.rohde@tu-dortmund.de)
Karsten Roscher (sfx@rocktale.de)
Ali Rostami (a.rostami@rutgers.edu)
Bill Roome (wdr@bell-labs.com)
David (david.rua@gmail.com)
Andrea Sacco (andrea.sacco85@gmail.com)
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)
Charitha Sangaraju (charitha29193@gmail.com)
Siddharth Santurkar (siddharth.santurkar@ieee.org)
Gaurav Sathe (gaurav.sathe@tcs.com)
Robert R. Schmidt (rschmi@gmx.net)
Florian Schmidt (Florian.Schmidt@cs.rwth-aachen.de)
Surya Seetharaman (suryaseetharaman.9@gmail.com)
Guillaume Seguin (guillaume.seguin@inria.fr)
Ioannis Selinis (selinis.g@gmail.com)
Tomasz Seweryn (tomasz.seweryn7@gmail.com)
@@ -170,12 +196,16 @@ Phillip Sitbon (phillip.sitbon@gmail.com)
Pedro Silva (pmms@inesctec.pt)
Anirudh Sivaraman (sk.anirudh@gmail.com)
Steven Smith (smith84@llnl.gov)
Izydor Sokoler (Izydor.sokoler@gmail.com)
Lauri Sormunen (lauri.sormunen@magister.fi)
Akin Soysal (akinsoysal@gmail.com)
Andrew Stanton (acstanton515@gmail.com)
Ewgenij Starostin (estar@cs.tu-berlin.de)
YunQiang Su (wzssyqa@gmail.com)
Brian Swenson (bswenson3@gatech.edu)
Lalith Suresh (suresh.lalith@gmail.com)
Mohit P. Tahiliani (tahiliani.nitk@gmail.com)
Rohit P. Tahiliani (tahiliar@tcd.ie)
Dave Taht (dave.taht@bufferbloat.net)
Marcos Talau (talau@users.sourceforge.net)
Adrian S. W. Tam (adrian.sw.tam@gmail.com)
@@ -194,6 +224,5 @@ Mitch Watrous (watrous@u.washington.edu)
Florian Westphal (fw@strlen.de)
He Wu (mdzz@u.washington.edu)
Yoshihiko Yazawa (yoshiyaz@gmail.com)
Menglei Zhang (menglei@nyu.edu)
Dizhi Zhou (dizhi.zhou@gmail.com)
Gaurav Sathe (gaurav.sathe@tcs.com)
Ali Rostami (a.rostami@rutgers.edu)
Loading