Attachment #1128 for bug #1157

View | Details | Raw Unified | Return to bug 1157
Collapse All | Expand All

(-)a/src/applications/model/packet-sink.cc (+3 lines)

Lines 169-174	Link Here

169

          NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " <<

169

          NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " <<

170

                       address.GetIpv4() << " [" << address << "]"

170

                       address.GetIpv4() << " [" << address << "]"

171

                                   << " total Rx " << m_totalRx);

171

                                   << " total Rx " << m_totalRx);

172

          // cast address to void , to suppress ‘address’ set but not used

173

          // compiler warning

174

          (void) address;

172

175

173

      m_rxTrace (packet, from);

176

      m_rxTrace (packet, from);

174

177

(-)a/src/applications/model/udp-echo-client.cc (+3 lines)

Lines 302-307	Link Here

302

          InetSocketAddress address = InetSocketAddress::ConvertFrom (from);

302

          InetSocketAddress address = InetSocketAddress::ConvertFrom (from);

303

          NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " <<

303

          NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " <<

304

                       address.GetIpv4());

304

                       address.GetIpv4());

305

          // cast address to void, to suppress ‘address’ set but not used

306

          // compiler warning

307

          (void) address;

305

308

306

309

307

310

(-)a/src/applications/model/udp-echo-server.cc (-1 / +4 lines)

Lines 120-126	Link Here

120

          InetSocketAddress address = InetSocketAddress::ConvertFrom (from);

120

          InetSocketAddress address = InetSocketAddress::ConvertFrom (from);

121

          NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " <<

121

          NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " <<

122

                       address.GetIpv4());

122

                       address.GetIpv4());

123

          // cast address to void, to suppress ‘address’ set but not used

124

          // compiler warning

125

          (void) address;

126

124

          packet->RemoveAllPacketTags ();

127

          packet->RemoveAllPacketTags ();

125

          packet->RemoveAllByteTags ();

128

          packet->RemoveAllByteTags ();

126

129

(-)a/src/applications/model/udp-server.cc (-2 / +1 lines)

Lines 146-152	Link Here

146

147

          SeqTsHeader seqTs;

147

          SeqTsHeader seqTs;

148

          packet->RemoveHeader (seqTs);

148

          packet->RemoveHeader (seqTs);

149

          Time delay = Simulator::Now () - seqTs.GetTs ();

150

          uint32_t currentSequenceNumber = seqTs.GetSeq ();

149

          uint32_t currentSequenceNumber = seqTs.GetSeq ();

151

          NS_LOG_INFO ("TraceDelay: RX " << packet->GetSize () <<

150

          NS_LOG_INFO ("TraceDelay: RX " << packet->GetSize () <<

152

                       " bytes from "<< InetSocketAddress::ConvertFrom(from).GetIpv4 () <<

151

                       " bytes from "<< InetSocketAddress::ConvertFrom(from).GetIpv4 () <<

Lines 154-160	Link Here

154

                       " Uid: " << packet->GetUid () <<

153

                       " Uid: " << packet->GetUid () <<

155

                       " TXtime: " << seqTs.GetTs () <<

154

                       " TXtime: " << seqTs.GetTs () <<

156

                       " RXtime: " << Simulator::Now () <<

155

                       " RXtime: " << Simulator::Now () <<

157

                       " Delay: " << delay) ;

156

                       " Delay: " << (Simulator::Now () - seqTs.GetTs ())) ;

158

157

159

          m_lossCounter.NotifyReceived (currentSequenceNumber);

158

          m_lossCounter.NotifyReceived (currentSequenceNumber);

160

          m_received++;

159

          m_received++;

(-)a/src/applications/model/v4ping.cc (+3 lines)

Lines 242-247	Link Here

242

  status = m_socket->Connect (dst);

242

  status = m_socket->Connect (dst);

243

  NS_ASSERT (status != -1);

243

  NS_ASSERT (status != -1);

244

245

  // cast status to void, to suppress ‘status’ set but not used

246

  // compiler warning

247

  (void) status;

245

  Send ();

248

  Send ();

246

249

247

void

250

void

Return to bug 1157