Attachment #2543 for bug #2474

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

(-)a/src/applications/helper/udp-client-server-helper.h (+8 lines)

Lines 125-130 public:	Link Here

125

126

   * \param ip The IP address of the remote UDP server

126

   * \param ip The IP address of the remote UDP server

127

   * \param port The port number of the remote UDP server

127

   * \param port The port number of the remote UDP server

128

   * \deprecated The non-const uint16_t argument is deprecated and will be

129

   * removed in a future release. Currently, if the provided address is of

130

   * type InetSocketAddress or Inet6SocketAddress, this argument is ignored

131

   * because it can be specified within the address.

128

*/

132

*/

129

133

130

  UdpClientHelper (Address ip, uint16_t port);

134

  UdpClientHelper (Address ip, uint16_t port);

Lines 178-183 public:	Link Here

178

   * \param ip The IP address of the remote UDP server

182

   * \param ip The IP address of the remote UDP server

179

   * \param port The port number of the remote UDP server

183

   * \param port The port number of the remote UDP server

180

   * \param filename the file from which packet traces will be loaded

184

   * \param filename the file from which packet traces will be loaded

185

   * \deprecated The non-const uint16_t argument is deprecated and will be

186

   * removed in a future release. Currently, if the provided address is of

187

   * type InetSocketAddress or Inet6SocketAddress, this argument is ignored

188

   * because it can be specified within the address.

181

*/

189

*/

182

  UdpTraceClientHelper (Address ip, uint16_t port, std::string filename);

190

  UdpTraceClientHelper (Address ip, uint16_t port, std::string filename);

183

/**

191

/**

(-)a/src/applications/helper/udp-echo-helper.h (+4 lines)

Lines 112-117 public:	Link Here

112

113

   * \param ip The IP address of the remote udp echo server

113

   * \param ip The IP address of the remote udp echo server

114

   * \param port The port number of the remote udp echo server

114

   * \param port The port number of the remote udp echo server

115

   * \deprecated The non-const uint16_t argument is deprecated and will be

116

   * removed in a future release. Currently, if the provided address is of

117

   * type InetSocketAddress or Inet6SocketAddress, this argument is ignored

118

   * because it can be specified within the address.

115

*/

119

*/

116

  UdpEchoClientHelper (Address ip, uint16_t port);

120

  UdpEchoClientHelper (Address ip, uint16_t port);

117

/**

121

/**




          m_socket->Bind6 ();
          m_socket->Connect (Inet6SocketAddress (Ipv6Address::ConvertFrom(m_peerAddress), m_peerPort));
        }
      else if (InetSocketAddress::IsMatchingType (m_peerAddress) == true)
        {
          m_socket->Bind ();
          m_socket->Connect (m_peerAddress);
        }
      else if (Inet6SocketAddress::IsMatchingType (m_peerAddress) == true)
        {
          m_socket->Bind6 ();
          m_socket->Connect (m_peerAddress);
        }
    }

  m_socket->SetRecvCallback (MakeNullCallback<void, Ptr<Socket> > ());

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

Lines 69-74 public:	Link Here

   * \brief set the remote address and port

   * \brief set the remote address and port

   * \param ip remote IP address

   * \param ip remote IP address

   * \param port remote port

   * \param port remote port

   * \deprecated The non-const uint16_t argument is deprecated and will be

   * removed in a future release. Currently, if the provided address is of

   * type InetSocketAddress or Inet6SocketAddress, this argument is ignored

   * because it can be specified within the address.

*/

*/

  void SetRemote (Address ip, uint16_t port);

  void SetRemote (Address ip, uint16_t port);




          m_socket->Bind6();
          m_socket->Connect (Inet6SocketAddress (Ipv6Address::ConvertFrom(m_peerAddress), m_peerPort));
        }
      else if (InetSocketAddress::IsMatchingType (m_peerAddress) == true)
        {
          m_socket->Bind ();
          m_socket->Connect (m_peerAddress);
        }
      else if (Inet6SocketAddress::IsMatchingType (m_peerAddress) == true)
        {
          m_socket->Bind6 ();
          m_socket->Connect (m_peerAddress);
        }
    }

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

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

Lines 65-70 public:	Link Here

   * \brief set the remote address and port

   * \brief set the remote address and port

   * \param ip remote IP address

   * \param ip remote IP address

   * \param port remote port

   * \param port remote port

   * \deprecated The non-const uint16_t argument is deprecated and will be

   * removed in a future release. Currently, if the provided address is of

   * type InetSocketAddress or Inet6SocketAddress, this argument is ignored

   * because it can be specified within the address.

*/

*/

  void SetRemote (Address ip, uint16_t port);

  void SetRemote (Address ip, uint16_t port);




          m_socket->Bind6 ();
          m_socket->Connect (Inet6SocketAddress (Ipv6Address::ConvertFrom (m_peerAddress), m_peerPort));
        }
      else if (InetSocketAddress::IsMatchingType (m_peerAddress) == true)
        {
          m_socket->Bind ();
          m_socket->Connect (m_peerAddress);
        }
      else if (Inet6SocketAddress::IsMatchingType (m_peerAddress) == true)
        {
          m_socket->Bind6 ();
          m_socket->Connect (m_peerAddress);
        }
    }
  m_socket->SetRecvCallback (MakeNullCallback<void, Ptr<Socket> > ());
  m_socket->SetAllowBroadcast (true);

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

Lines 92-97 public:	Link Here

   * \brief set the remote address and port

   * \brief set the remote address and port

   * \param ip remote IP address

   * \param ip remote IP address

   * \param port remote port

   * \param port remote port

   * \deprecated The non-const uint16_t argument is deprecated and will be

   * removed in a future release. Currently, if the provided address is of

   * type InetSocketAddress or Inet6SocketAddress, this argument is ignored

   * because it can be specified within the address.

*/

*/

  void SetRemote (Address ip, uint16_t port);

100

  void SetRemote (Address ip, uint16_t port);

101

Return to bug 2474