Attachment #2695 for bug #2106

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

(-)a/src/applications/model/bulk-send-application.cc (+1 lines)

Lines 118-123 void BulkSendApplication::StartApplication (void) // Called at time specified by	Link Here

118

  if (!m_socket)

118

  if (!m_socket)

119

120

      m_socket = Socket::CreateSocket (GetNode (), m_tid);

120

      m_socket = Socket::CreateSocket (GetNode (), m_tid);

121

      m_socketCreated (m_socket);

121

122

      // Fatal error if socket type is not NS3_SOCK_STREAM or NS3_SOCK_SEQPACKET

123

      // Fatal error if socket type is not NS3_SOCK_STREAM or NS3_SOCK_SEQPACKET

123

      if (m_socket->GetSocketType () != Socket::NS3_SOCK_STREAM &&

124

      if (m_socket->GetSocketType () != Socket::NS3_SOCK_STREAM &&

(-)a/src/applications/model/onoff-application.cc (+2 lines)

Lines 151-156 void OnOffApplication::StartApplication () // Called at time specified by Start	Link Here

151

  if (!m_socket)

151

  if (!m_socket)

152

153

      m_socket = Socket::CreateSocket (GetNode (), m_tid);

153

      m_socket = Socket::CreateSocket (GetNode (), m_tid);

154

      m_socketCreated (m_socket);

155

154

      if (Inet6SocketAddress::IsMatchingType (m_peer))

156

      if (Inet6SocketAddress::IsMatchingType (m_peer))

155

157

156

          m_socket->Bind6 ();

158

          m_socket->Bind6 ();

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

Lines 114-119 void PacketSink::StartApplication () // Called at time specified by Start	Link Here

114

  if (!m_socket)

114

  if (!m_socket)

115

116

      m_socket = Socket::CreateSocket (GetNode (), m_tid);

116

      m_socket = Socket::CreateSocket (GetNode (), m_tid);

117

      m_socketCreated (m_socket);

117

      m_socket->Bind (m_local);

118

      m_socket->Bind (m_local);

118

      m_socket->Listen ();

119

      m_socket->Listen ();

119

      m_socket->ShutdownSend ();

120

      m_socket->ShutdownSend ();

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

Lines 117-122 UdpClient::StartApplication (void)	Link Here

117

118

      TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");

118

      TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");

119

      m_socket = Socket::CreateSocket (GetNode (), tid);

119

      m_socket = Socket::CreateSocket (GetNode (), tid);

120

      m_socketCreated (m_socket);

120

      if (Ipv4Address::IsMatchingType(m_peerAddress) == true)

121

      if (Ipv4Address::IsMatchingType(m_peerAddress) == true)

121

122

          m_socket->Bind ();

123

          m_socket->Bind ();

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

Lines 125-130 UdpEchoClient::StartApplication (void)	Link Here

125

126

      TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");

126

      TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");

127

      m_socket = Socket::CreateSocket (GetNode (), tid);

127

      m_socket = Socket::CreateSocket (GetNode (), tid);

128

      m_socketCreated (m_socket);

128

      if (Ipv4Address::IsMatchingType(m_peerAddress) == true)

129

      if (Ipv4Address::IsMatchingType(m_peerAddress) == true)

129

130

          m_socket->Bind();

131

          m_socket->Bind();

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

Lines 81-86 UdpEchoServer::StartApplication (void)	Link Here

      TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");

      TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");

      m_socket = Socket::CreateSocket (GetNode (), tid);

      m_socket = Socket::CreateSocket (GetNode (), tid);

      m_socketCreated (m_socket);

      InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (), m_port);

      InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (), m_port);

      m_socket->Bind (local);

      m_socket->Bind (local);

      if (addressUtils::IsMulticast (m_local))

      if (addressUtils::IsMulticast (m_local))

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

Lines 119-124 UdpServer::StartApplication (void)	Link Here

119

120

      TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");

120

      TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");

121

      m_socket = Socket::CreateSocket (GetNode (), tid);

121

      m_socket = Socket::CreateSocket (GetNode (), tid);

122

      m_socketCreated (m_socket);

122

      InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (),

123

      InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (),

123

                                                   m_port);

124

                                                   m_port);

124

      m_socket->Bind (local);

125

      m_socket->Bind (local);

(-)a/src/applications/model/udp-trace-client.cc (+1 lines)

Lines 240-245 UdpTraceClient::StartApplication (void)	Link Here

240

241

      TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");

241

      TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");

242

      m_socket = Socket::CreateSocket (GetNode (), tid);

242

      m_socket = Socket::CreateSocket (GetNode (), tid);

243

      m_socketCreated (m_socket);

243

      if (Ipv4Address::IsMatchingType(m_peerAddress) == true)

244

      if (Ipv4Address::IsMatchingType(m_peerAddress) == true)

244

245

          m_socket->Bind ();

246

          m_socket->Bind ();

Return to bug 2106