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

(-)a/RELEASE_NOTES (+1 lines)
 Lines 29-34    Link Here 
29
29
30
Bugs fixed
30
Bugs fixed
31
----------
31
----------
32
- Bug 1739 - The endpoint is not deallocated for UDP sockets
32
- Bug 1786 - os << int64x64_t prints un-normalized fractional values
33
- Bug 1786 - os << int64x64_t prints un-normalized fractional values
33
- Bug 1821 - Setting an interface to Down state will cause various asserts in IPv6
34
- Bug 1821 - Setting an interface to Down state will cause various asserts in IPv6
34
- Bug 1837 - AODV crashes when using multiple interfaces
35
- Bug 1837 - AODV crashes when using multiple interfaces
(-)a/src/internet/model/tcp-socket-base.h (-1 / +1 lines)
 Lines 341-347    Link Here 
341
  void Destroy6 (void);
341
  void Destroy6 (void);
342
342
343
  /**
343
  /**
344
   * \brief Deallocate m_endPoint
344
   * \brief Deallocate m_endPoint and m_endPoint6
345
   */
345
   */
346
  void DeallocateEndPoint (void);
346
  void DeallocateEndPoint (void);
347
347
(-)a/src/internet/model/udp-socket-impl.cc (+20 lines)
 Lines 180-185    Link Here 
180
  m_endPoint6 = 0;
180
  m_endPoint6 = 0;
181
}
181
}
182
182
183
/* Deallocate the end point and cancel all the timers */
184
void
185
UdpSocketImpl::DeallocateEndPoint (void)
186
{
187
  if (m_endPoint != 0)
188
    {
189
      m_endPoint->SetDestroyCallback (MakeNullCallback<void> ());
190
      m_udp->DeAllocate (m_endPoint);
191
      m_endPoint = 0;
192
    }
193
  if (m_endPoint6 != 0)
194
    {
195
      m_endPoint6->SetDestroyCallback (MakeNullCallback<void> ());
196
      m_udp->DeAllocate (m_endPoint6);
197
      m_endPoint6 = 0;
198
    }
199
}
200
201
183
int
202
int
184
UdpSocketImpl::FinishBind (void)
203
UdpSocketImpl::FinishBind (void)
185
{
204
{
 Lines 322-327    Link Here 
322
    }
341
    }
323
  m_shutdownRecv = true;
342
  m_shutdownRecv = true;
324
  m_shutdownSend = true;
343
  m_shutdownSend = true;
344
  DeallocateEndPoint ();
325
  return 0;
345
  return 0;
326
}
346
}
327
347
(-)a/src/internet/model/udp-socket-impl.h (+5 lines)
 Lines 159-164    Link Here 
159
  void Destroy6 (void);
159
  void Destroy6 (void);
160
160
161
  /**
161
  /**
162
   * \brief Deallocate m_endPoint and m_endPoint6
163
   */
164
  void DeallocateEndPoint (void);
165
166
  /**
162
   * \brief Send a packet
167
   * \brief Send a packet
163
   * \param p packet
168
   * \param p packet
164
   * \returns 0 on success, -1 on failure
169
   * \returns 0 on success, -1 on failure

Return to bug 1739