Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(777)

Issue 4823051: Dynamic Source Routing (DSR)

Can't Edit
Can't Publish+Mail
Start Review
Created:
10 years, 11 months ago by ycheng
Modified:
10 years, 7 months ago
CC:
ns-3-reviews_googlegroups.com
Visibility:
Public.

Description

This issue is created to review the code that adds MANETs routing protocol Dynamic Source Routing (DSR) to ns-3 based on RFC 4728. This model is built to operate as a shim between IP and transport protocol and provide source routing functionalities. It operates based on several adjustable parameters, with a detail parameter list defined in dsr-routing.cc file. A detailed description of this implementation is shown in docs folder.

Patch Set 1 #

Patch Set 2 : small changes #

Patch Set 3 : small changes #

Total comments: 7

Patch Set 4 : patch based on comments #

Patch Set 5 : changes based on comments #

Patch Set 6 : delete one unused function #

Patch Set 7 : Changes to route request timer based on feedback #

Patch Set 8 : Added .rst file for feature discriptions, updated a little in route request process #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1484 lines, -1247 lines) Patch
M src/dsr/docs/dsr.h View 1 2 3 4 5 6 7 1 chunk +4 lines, -71 lines 0 comments Download
A src/dsr/docs/dsr.rst View 1 2 3 4 5 6 7 1 chunk +98 lines, -0 lines 0 comments Download
M src/dsr/examples/dsr.cc View 1 2 3 4 5 6 7 3 chunks +3 lines, -4 lines 0 comments Download
M src/dsr/model/dsr-fs-header.h View 1 2 3 2 chunks +10 lines, -10 lines 0 comments Download
M src/dsr/model/dsr-fs-header.cc View 1 2 3 7 chunks +13 lines, -11 lines 0 comments Download
M src/dsr/model/dsr-gratuitous-reply-table.h View 1 2 3 4 5 6 7 1 chunk +2 lines, -2 lines 0 comments Download
M src/dsr/model/dsr-gratuitous-reply-table.cc View 1 2 3 4 5 6 7 1 chunk +1 line, -1 line 0 comments Download
M src/dsr/model/dsr-maintain-buff.h View 1 2 3 4 5 6 7 9 chunks +14 lines, -69 lines 0 comments Download
M src/dsr/model/dsr-maintain-buff.cc View 1 2 3 4 5 6 7 5 chunks +34 lines, -43 lines 0 comments Download
M src/dsr/model/dsr-option-header.h View 1 2 3 4 5 6 7 2 chunks +8 lines, -8 lines 0 comments Download
M src/dsr/model/dsr-option-header.cc View 1 2 3 4 5 6 7 2 chunks +4 lines, -4 lines 0 comments Download
M src/dsr/model/dsr-options.h View 1 2 3 4 5 6 7 11 chunks +14 lines, -10 lines 0 comments Download
M src/dsr/model/dsr-options.cc View 1 2 3 4 5 6 7 49 chunks +148 lines, -132 lines 0 comments Download
M src/dsr/model/dsr-rcache.h View 1 2 3 4 5 6 7 6 chunks +44 lines, -38 lines 0 comments Download
M src/dsr/model/dsr-rcache.cc View 1 2 3 4 5 6 7 16 chunks +257 lines, -178 lines 0 comments Download
M src/dsr/model/dsr-routing.h View 1 2 3 4 5 6 7 17 chunks +53 lines, -31 lines 0 comments Download
M src/dsr/model/dsr-routing.cc View 1 2 3 4 5 6 7 71 chunks +638 lines, -456 lines 0 comments Download
M src/dsr/model/dsr-rreq-table.h View 1 2 3 4 5 6 7 6 chunks +24 lines, -26 lines 0 comments Download
M src/dsr/model/dsr-rreq-table.cc View 1 2 3 4 5 6 7 7 chunks +98 lines, -119 lines 0 comments Download
M src/dsr/model/dsr-rsendbuff.h View 1 2 3 4 5 6 7 3 chunks +3 lines, -5 lines 0 comments Download
M src/dsr/model/dsr-rsendbuff.cc View 1 2 3 4 5 6 7 5 chunks +6 lines, -19 lines 0 comments Download
M src/dsr/test/dsr-test-suite.cc View 1 2 3 4 5 6 7 3 chunks +4 lines, -9 lines 0 comments Download
M src/dsr/wscript View 1 2 3 4 5 6 7 2 chunks +4 lines, -1 line 0 comments Download

Messages

Total messages: 10
John Abraham
http://codereview.appspot.com/4823051/diff/4001/src/dsr/model/dsr-fs-header.cc File src/dsr/model/dsr-fs-header.cc (right): http://codereview.appspot.com/4823051/diff/4001/src/dsr/model/dsr-fs-header.cc#newcode195 src/dsr/model/dsr-fs-header.cc:195: uint32_t fill = CalculatePad ((DsrOptionHeader::Alignment) {4,0}); struct compound literals ...
10 years, 11 months ago (2011-08-10 15:42:13 UTC) #1
ycheng
On 2011/08/10 15:42:13, johnjoe7 wrote: > http://codereview.appspot.com/4823051/diff/4001/src/dsr/model/dsr-fs-header.cc > File src/dsr/model/dsr-fs-header.cc (right): > > http://codereview.appspot.com/4823051/diff/4001/src/dsr/model/dsr-fs-header.cc#newcode195 > ...
10 years, 11 months ago (2011-08-11 16:40:06 UTC) #2
Alaa Alhamoud
The implementation of DSR does not follow the model of other manets implementation in which ...
10 years, 8 months ago (2011-10-14 05:18:28 UTC) #3
Tom Henderson
On 2011/10/14 05:18:28, alaa.alhamoud wrote: > The implementation of DSR does not follow the model ...
10 years, 8 months ago (2011-10-17 05:26:33 UTC) #4
Alaa Alhamoud
On 2011/10/17 05:26:33, Tom Henderson wrote: > On 2011/10/14 05:18:28, alaa.alhamoud wrote: > > The ...
10 years, 8 months ago (2011-10-17 17:08:00 UTC) #5
tomh_tomh.org
On 10/17/2011 10:08 AM, alaa.alhamoud@googlemail.com wrote: > On 2011/10/17 05:26:33, Tom Henderson wrote: >> On ...
10 years, 8 months ago (2011-10-18 04:38:46 UTC) #6
Alaa Alhamoud
On 2011/10/18 04:38:46, tomh_tomh.org wrote: > On 10/17/2011 10:08 AM, mailto:alaa.alhamoud@googlemail.com wrote: > > On ...
10 years, 8 months ago (2011-10-19 20:01:40 UTC) #7
Guillermo Gala
I want to probe DSR routing protocol, but when i use the above code the ...
10 years, 8 months ago (2011-10-26 22:11:08 UTC) #8
Tom Henderson
On 2011/10/26 22:11:08, valentinosnake wrote: > I want to probe DSR routing protocol, but when ...
10 years, 7 months ago (2011-11-25 15:04:40 UTC) #9
Guillermo Gala
10 years, 7 months ago (2011-11-29 22:19:07 UTC) #10
On 2011/11/25 15:04:40, Tom Henderson wrote:
> On 2011/10/26 22:11:08, valentinosnake wrote:
> > I want to probe DSR routing protocol, but when i use the above code the
result
> > is:
> > 
> > ../src/dsr/model/dsr-routing.cc: En la función miembro ‘void
> > ns3::dsr::DsrRouting::SendRerrWhenBreaksLinkToNextHop(ns3::Ipv4Address,
> > uint8_t)’:
> > ../src/dsr/model/dsr-routing.cc:593:14: error: se define la variable
‘source’
> > pero no se usa [-Werror=unused-but-set-variable]
> > ../src/dsr/model/dsr-routing.cc: En la función miembro ‘bool
> > ns3::dsr::DsrRouting::PromiscReceive(ns3::Ptr<ns3::NetDevice>,
ns3::Ptr<const
> > ns3::Packet>, uint16_t, const ns3::Address&, const ns3::Address&,
> > ns3::NetDevice::PacketType)’:
> > ../src/dsr/model/dsr-routing.cc:858:10: error: se define la variable
> > ‘optionLength’ pero no se usa [-Werror=unused-but-set-variable]
> > ../src/dsr/model/dsr-routing.cc: En la función miembro ‘void
> >
ns3::dsr::DsrRouting::PacketScheduleTimerExpire(ns3::dsr::MaintainBuffEntry&,
> > const ns3::dsr::PacketKey&, uint8_t, bool)’:
> > ../src/dsr/model/dsr-routing.cc:1632:14: error: se define la variable ‘dst’
> pero
> > no se usa [-Werror=unused-but-set-variable]
> > ../src/dsr/model/dsr-options.cc: En la función miembro ‘virtual uint8_t
> > ns3::dsr::DsrOptionRreq::Process(ns3::Ptr<ns3::Packet>,
ns3::Ptr<ns3::Packet>,
> > ns3::Ipv4Address, const ns3::Ipv4Header&, uint8_t, bool&)’:
> > ../src/dsr/model/dsr-options.cc:456:7: error: se define la variable
‘isError’
> > pero no se usa [-Werror=unused-but-set-variable]
> > ../src/dsr/model/dsr-routing.cc: En la función miembro ‘void
> > ns3::dsr::DsrRouting::RouteRequestTimerExpire(ns3::Ptr<ns3::Packet>,
> > ns3::Ipv4Address, ns3::Ipv4Address, uint8_t)’:
> > ../src/dsr/model/dsr-routing.cc:1963:16: error:
> > ‘((ns3::dsr::DsrRouting*)this)->ns3::dsr::DsrRouting::EraseRreqTimer’ no
tiene
> > un tipo de clase
> > ../src/dsr/model/dsr-options.cc: En la función miembro ‘virtual uint8_t
> > ns3::dsr::DsrOptionRerr::Process(ns3::Ptr<ns3::Packet>,
ns3::Ptr<ns3::Packet>,
> > ns3::Ipv4Address, const ns3::Ipv4Header&, uint8_t, bool&)’:
> > ../src/dsr/model/dsr-options.cc:1259:14: error: se define la variable
> > ‘srcAddress’ pero no se usa [-Werror=unused-but-set-variable]
> > ../src/dsr/model/dsr-options.cc:1260:14: error: se define la variable
> > ‘destAddress’ pero no se usa [-Werror=unused-but-set-variable]
> > ../src/dsr/model/dsr-options.cc: En la función miembro ‘uint8_t
> > ns3::dsr::DsrOptionRerr::DoSendError(ns3::Ptr<ns3::Packet>,
> > ns3::dsr::DsrOptionRerrUnreachHeader&, uint32_t, ns3::Ipv4Address,
uint8_t)’:
> > ../src/dsr/model/dsr-options.cc:1361:14: error: se define la variable
> > ‘rerrUnreach’ pero no se usa [-Werror=unused-but-set-variable]
> > cc1plus: todos los avisos se tratan como errores
> > 
> > cc1plus: todos los avisos se tratan como errores
> > 
> > Anyone has the same problem?
> 
> This is a gcc-4.6 issue; gcc-4.6 may never have been used on this code yet. 
> Either delete these unused variables, or pass the -Wno-unused-but-set-variable
> flag in waf such as is already done in the top-level wscript:
> 
>     add_gcc_flag('-Wno-error=deprecated-declarations')
> +   add_gcc_flag('-Wno-unused-but-set-variable')

Hi Tom,

after add the line above I get this:

../src/dsr/model/dsr-routing.cc: En la función miembro ‘void
ns3::dsr::DsrRouting::RouteRequestTimerExpire(ns3::Ptr<ns3::Packet>,
ns3::Ipv4Address, ns3::Ipv4Address, uint8_t)’:
../src/dsr/model/dsr-routing.cc:1963:16: error:
‘((ns3::dsr::DsrRouting*)this)->ns3::dsr::DsrRouting::EraseRreqTimer’ no tiene
un tipo de clase

Regards
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b