Attachment #2826 for bug #2723

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

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

Lines 130-140	Link Here

130

131

      if (Inet6SocketAddress::IsMatchingType (m_peer))

131

      if (Inet6SocketAddress::IsMatchingType (m_peer))

132

133

          m_socket->Bind6 ();

133

          if (m_socket->Bind6 () == -1)

134

135

              NS_FATAL_ERROR ("Failed to bind socket");

136

134

137

135

      else if (InetSocketAddress::IsMatchingType (m_peer))

138

      else if (InetSocketAddress::IsMatchingType (m_peer))

136

139

137

          m_socket->Bind ();

140

          if (m_socket->Bind () == -1)

141

142

              NS_FATAL_ERROR ("Failed to bind socket");

143

138

144

139

145

140

      m_socket->Connect (m_peer);

146

      m_socket->Connect (m_peer);

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

Lines 153-164	Link Here

153

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

153

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

154

      if (Inet6SocketAddress::IsMatchingType (m_peer))

154

      if (Inet6SocketAddress::IsMatchingType (m_peer))

155

156

          m_socket->Bind6 ();

156

          if (m_socket->Bind6 () == -1)

157

158

              NS_FATAL_ERROR ("Failed to bind socket");

159

157

160

158

      else if (InetSocketAddress::IsMatchingType (m_peer) ||

161

      else if (InetSocketAddress::IsMatchingType (m_peer) ||

159

               PacketSocketAddress::IsMatchingType (m_peer))

162

               PacketSocketAddress::IsMatchingType (m_peer))

160

163

161

          m_socket->Bind ();

164

          if (m_socket->Bind () == -1)

165

166

              NS_FATAL_ERROR ("Failed to bind socket");

167

162

168

163

      m_socket->Connect (m_peer);

169

      m_socket->Connect (m_peer);

164

      m_socket->SetAllowBroadcast (true);

170

      m_socket->SetAllowBroadcast (true);

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

Lines 114-120	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_socket->Bind (m_local);

117

      if (m_socket->Bind (m_local) == -1)

118

119

          NS_FATAL_ERROR ("Failed to bind socket");

120

118

      m_socket->Listen ();

121

      m_socket->Listen ();

119

      m_socket->ShutdownSend ();

122

      m_socket->ShutdownSend ();

120

      if (addressUtils::IsMulticast (m_local))

123

      if (addressUtils::IsMulticast (m_local))

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

Lines 119-140	Link Here

119

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

119

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

120

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

120

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

121

122

          m_socket->Bind ();

122

          if (m_socket->Bind () == -1)

123

124

              NS_FATAL_ERROR ("Failed to bind socket");

125

123

          m_socket->Connect (InetSocketAddress (Ipv4Address::ConvertFrom(m_peerAddress), m_peerPort));

126

          m_socket->Connect (InetSocketAddress (Ipv4Address::ConvertFrom(m_peerAddress), m_peerPort));

124

127

125

      else if (Ipv6Address::IsMatchingType(m_peerAddress) == true)

128

      else if (Ipv6Address::IsMatchingType(m_peerAddress) == true)

126

129

127

          m_socket->Bind6 ();

130

          if (m_socket->Bind6 () == -1)

131

132

              NS_FATAL_ERROR ("Failed to bind socket");

133

128

          m_socket->Connect (Inet6SocketAddress (Ipv6Address::ConvertFrom(m_peerAddress), m_peerPort));

134

          m_socket->Connect (Inet6SocketAddress (Ipv6Address::ConvertFrom(m_peerAddress), m_peerPort));

129

135

130

      else if (InetSocketAddress::IsMatchingType (m_peerAddress) == true)

136

      else if (InetSocketAddress::IsMatchingType (m_peerAddress) == true)

131

137

132

          m_socket->Bind ();

138

          if (m_socket->Bind () == -1)

139

140

              NS_FATAL_ERROR ("Failed to bind socket");

141

133

          m_socket->Connect (m_peerAddress);

142

          m_socket->Connect (m_peerAddress);

134

143

135

      else if (Inet6SocketAddress::IsMatchingType (m_peerAddress) == true)

144

      else if (Inet6SocketAddress::IsMatchingType (m_peerAddress) == true)

136

145

137

          m_socket->Bind6 ();

146

          if (m_socket->Bind6 () == -1)

147

148

              NS_FATAL_ERROR ("Failed to bind socket");

149

138

          m_socket->Connect (m_peerAddress);

150

          m_socket->Connect (m_peerAddress);

139

151

140

      else

152

      else

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

Lines 127-148	Link Here

127

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

127

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

128

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

128

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

129

130

          m_socket->Bind();

130

          if (m_socket->Bind () == -1)

131

132

              NS_FATAL_ERROR ("Failed to bind socket");

133

131

          m_socket->Connect (InetSocketAddress (Ipv4Address::ConvertFrom(m_peerAddress), m_peerPort));

134

          m_socket->Connect (InetSocketAddress (Ipv4Address::ConvertFrom(m_peerAddress), m_peerPort));

132

135

133

      else if (Ipv6Address::IsMatchingType(m_peerAddress) == true)

136

      else if (Ipv6Address::IsMatchingType(m_peerAddress) == true)

134

137

135

          m_socket->Bind6();

138

          if (m_socket->Bind6 () == -1)

139

140

              NS_FATAL_ERROR ("Failed to bind socket");

141

136

          m_socket->Connect (Inet6SocketAddress (Ipv6Address::ConvertFrom(m_peerAddress), m_peerPort));

142

          m_socket->Connect (Inet6SocketAddress (Ipv6Address::ConvertFrom(m_peerAddress), m_peerPort));

137

143

138

      else if (InetSocketAddress::IsMatchingType (m_peerAddress) == true)

144

      else if (InetSocketAddress::IsMatchingType (m_peerAddress) == true)

139

145

140

          m_socket->Bind ();

146

          if (m_socket->Bind () == -1)

147

148

              NS_FATAL_ERROR ("Failed to bind socket");

149

141

          m_socket->Connect (m_peerAddress);

150

          m_socket->Connect (m_peerAddress);

142

151

143

      else if (Inet6SocketAddress::IsMatchingType (m_peerAddress) == true)

152

      else if (Inet6SocketAddress::IsMatchingType (m_peerAddress) == true)

144

153

145

          m_socket->Bind6 ();

154

          if (m_socket->Bind6 () == -1)

155

156

              NS_FATAL_ERROR ("Failed to bind socket");

157

146

          m_socket->Connect (m_peerAddress);

158

          m_socket->Connect (m_peerAddress);

147

159

148

      else

160

      else

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

Lines 82-88	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);

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

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

      m_socket->Bind (local);

      if (m_socket->Bind (local) == -1)

          NS_FATAL_ERROR ("Failed to bind socket");

      if (addressUtils::IsMulticast (m_local))

      if (addressUtils::IsMulticast (m_local))

          Ptr<UdpSocket> udpSocket = DynamicCast<UdpSocket> (m_socket);

          Ptr<UdpSocket> udpSocket = DynamicCast<UdpSocket> (m_socket);

Lines 103-109	Link Here

103

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

106

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

104

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

107

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

105

      Inet6SocketAddress local6 = Inet6SocketAddress (Ipv6Address::GetAny (), m_port);

108

      Inet6SocketAddress local6 = Inet6SocketAddress (Ipv6Address::GetAny (), m_port);

106

      m_socket6->Bind (local6);

109

      if (m_socket6->Bind (local6) == -1)

110

111

          NS_FATAL_ERROR ("Failed to bind socket");

112

107

      if (addressUtils::IsMulticast (local6))

113

      if (addressUtils::IsMulticast (local6))

108

114

109

          Ptr<UdpSocket> udpSocket = DynamicCast<UdpSocket> (m_socket6);

115

          Ptr<UdpSocket> udpSocket = DynamicCast<UdpSocket> (m_socket6);

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

Lines 121-127	Link Here

121

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

121

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

122

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

122

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

123

                                                   m_port);

123

                                                   m_port);

124

      m_socket->Bind (local);

124

      if (m_socket->Bind (local) == -1)

125

126

          NS_FATAL_ERROR ("Failed to bind socket");

127

125

128

126

129

127

  m_socket->SetRecvCallback (MakeCallback (&UdpServer::HandleRead, this));

130

  m_socket->SetRecvCallback (MakeCallback (&UdpServer::HandleRead, this));

Lines 132-138	Link Here

132

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

135

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

133

      Inet6SocketAddress local = Inet6SocketAddress (Ipv6Address::GetAny (),

136

      Inet6SocketAddress local = Inet6SocketAddress (Ipv6Address::GetAny (),

134

                                                   m_port);

137

                                                   m_port);

135

      m_socket6->Bind (local);

138

      if (m_socket6->Bind (local) == -1)

139

140

          NS_FATAL_ERROR ("Failed to bind socket");

141

136

142

137

143

138

  m_socket6->SetRecvCallback (MakeCallback (&UdpServer::HandleRead, this));

144

  m_socket6->SetRecvCallback (MakeCallback (&UdpServer::HandleRead, this));

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

Lines 242-263	Link Here

242

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

242

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

243

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

243

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

244

245

          m_socket->Bind ();

245

          if (m_socket->Bind () == -1)

246

247

              NS_FATAL_ERROR ("Failed to bind socket");

248

246

          m_socket->Connect (InetSocketAddress (Ipv4Address::ConvertFrom (m_peerAddress), m_peerPort));

249

          m_socket->Connect (InetSocketAddress (Ipv4Address::ConvertFrom (m_peerAddress), m_peerPort));

247

250

248

      else if (Ipv6Address::IsMatchingType(m_peerAddress) == true)

251

      else if (Ipv6Address::IsMatchingType(m_peerAddress) == true)

249

252

250

          m_socket->Bind6 ();

253

          if (m_socket->Bind6 () == -1)

254

255

              NS_FATAL_ERROR ("Failed to bind socket");

256

251

          m_socket->Connect (Inet6SocketAddress (Ipv6Address::ConvertFrom (m_peerAddress), m_peerPort));

257

          m_socket->Connect (Inet6SocketAddress (Ipv6Address::ConvertFrom (m_peerAddress), m_peerPort));

252

258

253

      else if (InetSocketAddress::IsMatchingType (m_peerAddress) == true)

259

      else if (InetSocketAddress::IsMatchingType (m_peerAddress) == true)

254

260

255

          m_socket->Bind ();

261

          if (m_socket->Bind () == -1)

262

263

              NS_FATAL_ERROR ("Failed to bind socket");

264

256

          m_socket->Connect (m_peerAddress);

265

          m_socket->Connect (m_peerAddress);

257

266

258

      else if (Inet6SocketAddress::IsMatchingType (m_peerAddress) == true)

267

      else if (Inet6SocketAddress::IsMatchingType (m_peerAddress) == true)

259

268

260

          m_socket->Bind6 ();

269

          if (m_socket->Bind6 () == -1)

270

271

              NS_FATAL_ERROR ("Failed to bind socket");

272

261

          m_socket->Connect (m_peerAddress);

273

          m_socket->Connect (m_peerAddress);

262

274

263

      else

275

      else

Return to bug 2723