Commit d6f46156 authored by rna's avatar rna
Browse files

-= redundant address conversions when sending feedback

parent e33bec33

prrt/proto/processes/dataReceiver.c

+1 −13
Original line number Original line Diff line number Diff line
@@ -83,18 +83,6 @@ static bool send_feedback(PrrtSocket *sock_ptr, 
            .sentTime = sentTimestamp

            .sentTime = sentTimestamp

    };

    };





    uint16_t remote_port = ntohs(remote.sin_port);

    char *remote_host = inet_ntoa(remote.sin_addr);



    struct sockaddr_in targetaddr;

    memset((char *) &targetaddr, 0, sizeof(targetaddr));

    targetaddr.sin_family = AF_INET;

    targetaddr.sin_port = htons((uint16_t) (remote_port));



    struct hostent *hp;

    hp = gethostbyname(remote_host);

    memcpy((void *) &targetaddr.sin_addr, hp->h_addr_list[0], (size_t) hp->h_length);



    prrtTimestamp_t forwardTripTime = (uint32_t) (((int64_t) PrrtClock_get_current_time_us()) +

    prrtTimestamp_t forwardTripTime = (uint32_t) (((int64_t) PrrtClock_get_current_time_us()) +

                                                  (sock_ptr->lastSentTimestamp - sock_ptr->lastReceivedTimestamp));

                                                  (sock_ptr->lastSentTimestamp - sock_ptr->lastReceivedTimestamp));
@@ -114,7 +102,7 @@ static bool send_feedback(PrrtSocket *sock_ptr, 
    check(PrrtPacket_encode(buf, MAX_PAYLOAD_LENGTH, feedback_pkt_ptr), "Buffer for encoding feedback is too small");

    check(PrrtPacket_encode(buf, MAX_PAYLOAD_LENGTH, feedback_pkt_ptr), "Buffer for encoding feedback is too small");





    pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);

    pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);

    check(sendto(sock_ptr->socketFd, buf, length, 0, (struct sockaddr *) &targetaddr, sizeof(targetaddr)) ==

    check(sendto(sock_ptr->socketFd, buf, length, 0, (struct sockaddr *) &remote, sizeof(remote)) ==

          length, "Sending feedback failed.");

          length, "Sending feedback failed.");

    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);

    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);

    free(buf);

    free(buf);