SATIP-Add-socket_id-in-logs.diff

Patch - Mono Polimorph, 2017-08-07 17:31

Download (2.34 KB)

View differences:

src/satip/rtp.c
910 910
      if (tvhtrace_enabled()) {
911 911
        msg[len] = '\0';
912 912
        tcp_get_str_from_ip(&rtp->peer2, addrbuf, sizeof(addrbuf));
913
        tvhtrace(LS_SATIPS, "RTCP send to %s:%d : %s", addrbuf, ntohs(IP_PORT(rtp->peer2)), msg + 16);
913
        tvhtrace(LS_SATIPS, "RTCP send to %s:%d (sock:%d): %s", addrbuf, ntohs(IP_PORT(rtp->peer2)),(rtp->port == RTS
925 925
      if (r < 0) {
926 926
        if (err != ECONNREFUSED) {
927 927
          tcp_get_str_from_ip(&rtp->peer2, addrbuf, sizeof(addrbuf));
928
          tvhwarn(LS_SATIPS, "RTCP send to error %s:%d : %s",
929
                  addrbuf, ntohs(IP_PORT(rtp->peer2)), strerror(err));
928
          tvhwarn(LS_SATIPS, "RTCP send to error %s:%d (sock:%d): %s",
929
                  addrbuf, ntohs(IP_PORT(rtp->peer2)),(rtp->port == RTSP_TCP_DATA)? rtp->fd_rtp:rtp->fd_rtcp, strerro
src/satip/rtsp.c
1163 1163
  if (mpegts_pid_dump(&rs->pids, buf + r, sizeof(buf) - r, 0, 0) == 0)
1164 1164
    tvh_strlcatf(buf, sizeof(buf), r, "<none>");
1165 1165

  
1166
  tvhdebug(LS_SATIPS, "%i/%s/%d: %s from %s:%d %s",
1166
  tvhdebug(LS_SATIPS, "%i/%s/%d: %s from %s:%d (sock:%d) %s",
1167 1167
           rs->frontend, rs->session, rs->stream,
1168
           caller, hc->hc_peer_ipstr, ntohs(IP_PORT(*hc->hc_peer)), buf);
1168
           caller, hc->hc_peer_ipstr, ntohs(IP_PORT(*hc->hc_peer)), hc->hc_fd, buf);
1169 1169

  
1170 1170
ok:
1171 1171
  errcode = 0;
......
1484 1484
    return 0;
1485 1485
  }
1486 1486

  
1487
  tvhdebug(LS_SATIPS, "-/%s/%i: teardown from %s:%d",
1488
           hc->hc_session, stream, hc->hc_peer_ipstr, ntohs(IP_PORT(*hc->hc_peer)));
1487
  tvhdebug(LS_SATIPS, "-/%s/%i: teardown from %s:%d (sock:%d)",
1488
           hc->hc_session, stream, hc->hc_peer_ipstr, ntohs(IP_PORT(*hc->hc_peer)), hc->hc_fd);
1489 1489

  
1490 1490
  pthread_mutex_lock(&rtsp_lock);
1491 1491
  rs = rtsp_find_session(hc, stream);