git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/live-inet_ntop.patch

   1 Copyright (C) 2010 Rémi Denis-Courmont.
   2 Licensed under GNU General Public License version 2 or higher.
   3 diff -ru live.orig/groupsock/Groupsock.cpp live/groupsock/Groupsock.cpp
   4 --- live.orig/groupsock/Groupsock.cpp   2010-10-20 10:31:13.000000000 +0200
   5 +++ live/groupsock/Groupsock.cpp        2010-10-20 12:34:04.762178010 +0200
   6 @@ -335,8 +335,10 @@
   7      }
   8    }
   9    if (DebugLevel >= 3) {
  10 +    char buf[16];
  11 +
  12      env() << *this << ": read " << bytesRead << " bytes from ";
  13 -    env() << our_inet_ntoa(fromAddress.sin_addr);
  14 +    env() << our_inet_ntoa(fromAddress.sin_addr, buf);
  15      if (numMembers > 0) {
  16        env() << "; relayed to " << numMembers << " members";
  17      }
  18 @@ -445,13 +447,14 @@
  19  }
  20
  21  UsageEnvironment& operator<<(UsageEnvironment& s, const Groupsock& g) {
  22 +  char buf[16];
  23    UsageEnvironment& s1 = s << timestampString() << " Groupsock("
  24                            << g.socketNum() << ": "
  25 -                          << our_inet_ntoa(g.groupAddress())
  26 +                          << our_inet_ntoa(g.groupAddress(), buf)
  27                            << ", " << g.port() << ", ";
  28    if (g.isSSM()) {
  29      return s1 << "SSM source: "
  30 -             <<  our_inet_ntoa(g.sourceFilterAddress()) << ")";
  31 +             <<  our_inet_ntoa(g.sourceFilterAddress(), buf) << ")";
  32    } else {
  33      return s1 << (unsigned)(g.ttl()) << ")";
  34    }
  35 diff -ru live.orig/groupsock/include/GroupsockHelper.hh live/groupsock/include/GroupsockHelper.hh
  36 --- live.orig/groupsock/include/GroupsockHelper.hh      2010-10-20 10:31:13.000000000 +0200
  37 +++ live/groupsock/include/GroupsockHelper.hh   2010-10-20 12:34:04.762178010 +0200
  38 @@ -116,7 +116,7 @@
  39
  40  // The following are implemented in inet.c:
  41  extern "C" netAddressBits our_inet_addr(char const*);
  42 -extern "C" char* our_inet_ntoa(struct in_addr);
  43 +extern "C" char* our_inet_ntoa(struct in_addr, char *);
  44  extern "C" struct hostent* our_gethostbyname(char* name);
  45  extern "C" void our_srandom(int x);
  46  extern "C" long our_random();
  47 diff -ru live.orig/groupsock/inet.c live/groupsock/inet.c
  48 --- live.orig/groupsock/inet.c  2010-10-20 10:31:13.000000000 +0200
  49 +++ live/groupsock/inet.c       2010-10-20 12:34:04.762178010 +0200
  50 @@ -21,26 +21,19 @@
  51  }
  52
  53  char *
  54 -our_inet_ntoa(in)
  55 -        struct in_addr in;
  56 +our_inet_ntoa(in, result)
  57 +       struct in_addr in;
  58 +       char *result;
  59  {
  60 -#ifndef VXWORKS
  61 -  return inet_ntoa(in);
  62 +#ifdef WIN32
  63 +  char *ret = inet_ntoa(in);
  64 +  if(ret != NULL)
  65 +     strncpy(result, ret, 16);
  66 +  return ret;
  67 +#elif !defined (VXWORKS)
  68 +  inet_ntop(AF_INET, &in, result, 16);
  69 +  return(result);
  70  #else
  71 -  /* according the man pages of inet_ntoa :
  72 -
  73 -     NOTES
  74 -     The return value from inet_ntoa() points to a  buffer  which
  75 -     is  overwritten on each call.  This buffer is implemented as
  76 -     thread-specific data in multithreaded applications.
  77 -
  78 -     the vxworks version of inet_ntoa allocates a buffer for each
  79 -     ip address string, and does not reuse the same buffer.
  80 -
  81 -     this is merely to simulate the same behaviour (not multithread
  82 -     safe though):
  83 -  */
  84 -  static char result[INET_ADDR_LEN];
  85    inet_ntoa_b(in, result);
  86    return(result);
  87  #endif
  88 diff -ru live.orig/liveMedia/DarwinInjector.cpp live/liveMedia/DarwinInjector.cpp
  89 --- live.orig/liveMedia/DarwinInjector.cpp      2010-10-20 10:31:13.000000000 +0200
  90 +++ live/liveMedia/DarwinInjector.cpp   2010-10-20 12:34:04.762178010 +0200
  91 @@ -146,7 +146,8 @@
  92        NetAddress const* address = addresses.firstAddress();
  93        addr.s_addr = *(unsigned*)(address->data());
  94      }
  95 -    char const* remoteRTSPServerAddressStr = our_inet_ntoa(addr);
  96 +    char buf[16];
  97 +    char const* remoteRTSPServerAddressStr = our_inet_ntoa(addr, buf);
  98
  99      // Construct a SDP description for the session that we'll be streaming:
 100      char const* const sdpFmt =
 101 diff -ru live.orig/liveMedia/OnDemandServerMediaSubsession.cpp live/liveMedia/OnDemandServerMediaSubsession.cpp
 102 --- live.orig/liveMedia/OnDemandServerMediaSubsession.cpp       2010-10-20 10:31:13.000000000 +0200
 103 +++ live/liveMedia/OnDemandServerMediaSubsession.cpp    2010-10-20 12:34:04.762178010 +0200
 104 @@ -365,7 +365,8 @@
 105    char const* mediaType = rtpSink->sdpMediaType();
 106    unsigned char rtpPayloadType = rtpSink->rtpPayloadType();
 107    struct in_addr serverAddrForSDP; serverAddrForSDP.s_addr = fServerAddressForSDP;
 108 -  char* const ipAddressStr = strDup(our_inet_ntoa(serverAddrForSDP));
 109 +  char ipAddressStr[16];
 110 +  our_inet_ntoa(serverAddrForSDP, ipAddressStr);
 111    char* rtpmapLine = rtpSink->rtpmapLine();
 112    char const* rangeLine = rangeSDPLine();
 113    char const* auxSDPLine = getAuxSDPLine(rtpSink, inputSource);
 114 @@ -398,7 +399,7 @@
 115           rangeLine, // a=range:... (if present)
 116           auxSDPLine, // optional extra SDP line
 117           trackId()); // a=control:<track-id>
 118 -  delete[] (char*)rangeLine; delete[] rtpmapLine; delete[] ipAddressStr;
 119 +  delete[] (char*)rangeLine; delete[] rtpmapLine;
 120
 121    fSDPLines = strDup(sdpLines);
 122    delete[] sdpLines;
 123 diff -ru live.orig/liveMedia/PassiveServerMediaSubsession.cpp live/liveMedia/PassiveServerMediaSubsession.cpp
 124 --- live.orig/liveMedia/PassiveServerMediaSubsession.cpp        2010-10-20 10:31:13.000000000 +0200
 125 +++ live/liveMedia/PassiveServerMediaSubsession.cpp     2010-10-20 12:34:04.762178010 +0200
 126 @@ -54,7 +54,8 @@
 127      char const* auxSDPLine = fRTPSink.auxSDPLine();
 128      if (auxSDPLine == NULL) auxSDPLine = "";
 129
 130 -    char* const ipAddressStr = strDup(our_inet_ntoa(ipAddress));
 131 +    char ipAddressStr[16];
 132 +    our_inet_ntoa(ipAddress, ipAddressStr);
 133
 134      char const* const sdpFmt =
 135        "m=%s %d RTP/AVP %d\r\n"
 136 @@ -84,7 +85,7 @@
 137             rangeLine, // a=range:... (if present)
 138             auxSDPLine, // optional extra SDP line
 139             trackId()); // a=control:<track-id>
 140 -    delete[] ipAddressStr; delete[] (char*)rangeLine; delete[] rtpmapLine;
 141 +    delete[] (char*)rangeLine; delete[] rtpmapLine;
 142
 143      fSDPLines = strDup(sdpLines);
 144      delete[] sdpLines;
 145 diff -ru live.orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
 146 --- live.orig/liveMedia/RTSPClient.cpp  2010-10-20 12:34:33.662177993 +0200
 147 +++ live/liveMedia/RTSPClient.cpp       2010-10-20 12:34:04.762178010 +0200
 148 @@ -411,7 +411,8 @@
 149  int RTSPClient::connectToServer(int socketNum, portNumBits remotePortNum) {
 150    MAKE_SOCKADDR_IN(remoteName, fServerAddress, htons(remotePortNum));
 151    if (fVerbosityLevel >= 1) {
 152 -    envir() << "Opening connection to " << our_inet_ntoa(remoteName.sin_addr) << ", port " << remotePortNum << "...\n";
 153 +    char buf[16];
 154 +    envir() << "Opening connection to " << our_inet_ntoa(remoteName.sin_addr, buf) << ", port " << remotePortNum << "...\n";
 155    }
 156    if (connect(socketNum, (struct sockaddr*) &remoteName, sizeof remoteName) != 0) {
 157      if (envir().getErrno() == EINPROGRESS) {
 158 diff -ru live.orig/liveMedia/RTSPServer.cpp live/liveMedia/RTSPServer.cpp
 159 --- live.orig/liveMedia/RTSPServer.cpp  2010-10-20 10:31:13.000000000 +0200
 160 +++ live/liveMedia/RTSPServer.cpp       2010-10-20 12:34:04.772177998 +0200
 161 @@ -111,11 +111,12 @@
 162    char urlBuffer[100]; // more than big enough for "rtsp://<ip-address>:<port>/"
 163
 164    portNumBits portNumHostOrder = ntohs(fRTSPServerPort.num());
 165 +  char buf[16];
 166    if (portNumHostOrder == 554 /* the default port number */) {
 167 -    sprintf(urlBuffer, "rtsp://%s/", our_inet_ntoa(ourAddress.sin_addr));
 168 +    sprintf(urlBuffer, "rtsp://%s/", our_inet_ntoa(ourAddress.sin_addr, buf));
 169    } else {
 170      sprintf(urlBuffer, "rtsp://%s:%hu/",
 171 -           our_inet_ntoa(ourAddress.sin_addr), portNumHostOrder);
 172 +           our_inet_ntoa(ourAddress.sin_addr, buf), portNumHostOrder);
 173    }
 174
 175    return strDup(urlBuffer);
 176 @@ -264,7 +265,8 @@
 177    increaseSendBufferTo(envir(), clientSocket, 50*1024);
 178
 179  #ifdef DEBUG
 180 -  envir() << "accept()ed connection from " << our_inet_ntoa(clientAddr.sin_addr) << "\n";
 181 +  char buf[16];
 182 +  envir() << "accept()ed connection from " << our_inet_ntoa(clientAddr.sin_addr, buf) << "\n";
 183  #endif
 184
 185    // Create a new object for this RTSP session.
 186 @@ -860,8 +862,10 @@
 187    ReceivingInterfaceAddr = origReceivingInterfaceAddr;
 188
 189    struct in_addr destinationAddr; destinationAddr.s_addr = destinationAddress;
 190 -  char* destAddrStr = strDup(our_inet_ntoa(destinationAddr));
 191 -  char* sourceAddrStr = strDup(our_inet_ntoa(sourceAddr.sin_addr));
 192 +  char destAddrStr[16];
 193 +  our_inet_ntoa(destinationAddr, destAddrStr);
 194 +  char sourceAddrStr[16];
 195 +  our_inet_ntoa(sourceAddr.sin_addr, sourceAddrStr);
 196    if (fIsMulticast) {
 197      switch (streamingMode) {
 198      case RTP_UDP:
 199 @@ -936,7 +940,7 @@
 200      }
 201      }
 202    }
 203 -  delete[] destAddrStr; delete[] sourceAddrStr; delete[] streamingModeString;
 204 +  delete[] streamingModeString;
 205  }
 206
 207  void RTSPServer::RTSPClientSession
 208 @@ -1446,7 +1450,8 @@
 209    // If this gets called, the client session is assumed to have timed out,
 210    // so delete it:
 211  #ifdef DEBUG
 212 -  fprintf(stderr, "RTSP client session from %s has timed out (due to inactivity)\n", our_inet_ntoa(clientSession->fClientAddr.sin_addr));
 213 +  char buf[16];
 214 +  fprintf(stderr, "RTSP client session from %s has timed out (due to inactivity)\n", our_inet_ntoa(clientSession->fClientAddr.sin_addr, buf));
 215  #endif
 216    delete clientSession;
 217  }
 218 diff -ru live.orig/liveMedia/ServerMediaSession.cpp live/liveMedia/ServerMediaSession.cpp
 219 --- live.orig/liveMedia/ServerMediaSession.cpp  2010-10-20 10:31:13.000000000 +0200
 220 +++ live/liveMedia/ServerMediaSession.cpp       2010-10-20 12:34:04.772177998 +0200
 221 @@ -185,7 +185,8 @@
 222  char* ServerMediaSession::generateSDPDescription() {
 223    struct in_addr ipAddress;
 224    ipAddress.s_addr = ourIPAddress(envir());
 225 -  char* const ipAddressStr = strDup(our_inet_ntoa(ipAddress));
 226 +  char ipAddressStr[16];
 227 +  our_inet_ntoa(ipAddress, ipAddressStr);
 228    unsigned ipAddressStrSize = strlen(ipAddressStr);
 229
 230    // For a SSM sessions, we need a "a=source-filter: incl ..." line also:
 231 @@ -281,7 +282,7 @@
 232      }
 233    } while (0);
 234
 235 -  delete[] rangeLine; delete[] sourceFilterLine; delete[] ipAddressStr;
 236 +  delete[] rangeLine; delete[] sourceFilterLine;
 237    return sdp;
 238  }
 239
 240 diff -ru live.orig/liveMedia/SIPClient.cpp live/liveMedia/SIPClient.cpp
 241 --- live.orig/liveMedia/SIPClient.cpp   2010-10-20 10:31:13.000000000 +0200
 242 +++ live/liveMedia/SIPClient.cpp        2010-10-20 12:34:04.772177998 +0200
 243 @@ -60,13 +60,14 @@
 244
 245    struct in_addr ourAddress;
 246    ourAddress.s_addr = ourIPAddress(env); // hack
 247 -  fOurAddressStr = strDup(our_inet_ntoa(ourAddress));
 248 +  char buf[16];
 249 +  fOurAddressStr = strDup(our_inet_ntoa(ourAddress, buf));
 250    fOurAddressStrSize = strlen(fOurAddressStr);
 251
 252    fOurSocket = new Groupsock(env, ourAddress, 0, 255);
 253    if (fOurSocket == NULL) {
 254      env << "ERROR: Failed to create socket for addr "
 255 -       << our_inet_ntoa(ourAddress) << ": "
 256 +       << our_inet_ntoa(ourAddress, buf) << ": "
 257         << env.getResultMsg() << "\n";
 258    }
 259
 260 @@ -84,7 +85,7 @@
 261      fOurSocket = new Groupsock(env, ourAddress, fOurPortNum, 255);
 262      if (fOurSocket == NULL) {
 263        env << "ERROR: Failed to create socket for addr "
 264 -         << our_inet_ntoa(ourAddress) << ", port "
 265 +         << our_inet_ntoa(ourAddress, buf) << ", port "
 266           << fOurPortNum << ": "
 267           << env.getResultMsg() << "\n";
 268      }
 269 diff -ru live.orig/testProgs/sapWatch.cpp live/testProgs/sapWatch.cpp
 270 --- live.orig/testProgs/sapWatch.cpp    2010-10-20 10:31:13.000000000 +0200
 271 +++ live/testProgs/sapWatch.cpp 2010-10-20 12:34:04.772177998 +0200
 272 @@ -49,13 +49,14 @@
 273    struct sockaddr_in fromAddress;
 274    while (inputGroupsock.handleRead(packet, maxPacketSize,
 275                                    packetSize, fromAddress)) {
 276 +    char buf[16];
 277      printf("\n[packet from %s (%d bytes)]\n",
 278 -          our_inet_ntoa(fromAddress.sin_addr), packetSize);
 279 +          our_inet_ntoa(fromAddress.sin_addr, buf), packetSize);
 280
 281      // Ignore the first 8 bytes (SAP header).
 282      if (packetSize < 8) {
 283        *env << "Ignoring short packet from "
 284 -          << our_inet_ntoa(fromAddress.sin_addr) << "%s!\n";
 285 +          << our_inet_ntoa(fromAddress.sin_addr, buf) << "%s!\n";
 286        continue;
 287      }
 288