Changeset 89609d0 for lib


Ignore:
Timestamp:
11/14/18 10:46:01 (2 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
develop
Children:
723f1af
Parents:
6f43f5c (diff), 4819d75 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into develop

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/format_ndag.c

    r6a2f037 r857729e  
    752752        }
    753753
     754        ssock->sock = join_multicast_group(src.groupaddr, src.localiface,
     755                        NULL, src.port, &(ssock->srcaddr));
     756
     757        if (ssock->sock < 0) {
     758                return -1;
     759        }
     760
     761        if (ssock->sock > rt->maxfd) {
     762                rt->maxfd = ssock->sock;
     763        }
     764
    754765#if HAVE_DECL_RECVMMSG
    755766        for (i = 0; i < RECV_BATCH_SIZE; i++) {
     
    772783        ssock->recordcount = 0;
    773784        rt->sourcecount += 1;
    774 
    775         ssock->sock = join_multicast_group(src.groupaddr, src.localiface,
    776                         NULL, src.port, &(ssock->srcaddr));
    777 
    778         if (ssock->sock < 0) {
    779                 return -1;
    780         }
    781 
    782         if (ssock->sock > rt->maxfd) {
    783                 rt->maxfd = ssock->sock;
    784         }
    785785
    786786        fprintf(stderr, "Added new stream %s:%u to thread %d\n",
     
    958958                        MSG_DONTWAIT, NULL);
    959959#else
     960        if (avail != 1) {
     961                return 0;
     962        }
     963
    960964        ret = recvmsg(ssock->sock, &(ssock->singlemsg), MSG_DONTWAIT);
    961965#endif
Note: See TracChangeset for help on using the changeset viewer.