maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a small bug and add a log for when recvfrom() fails

Browse Source 
recvfrom() returns ssize_t, not size_t.
This commit is contained in:
Cedric Roux
2023-01-18 10:23:37 +01:00
parent 08e57ca313
commit fc7bcceca9
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/ETHERNET/USERSPACE/LIB/eth_udp.c
+14 -5
View File
@@ -447,10 +447,20 @@ void *udp_read_thread(void *arg) {
while (oai_exit == 0) { while (oai_exit == 0) {
LOG_I(PHY,"UDP read thread %d, waiting for start sampling_rate_d %d, sampling_rate_n %d\n",u->thread_id,device->sampling_rate_ratio_n,device->sampling_rate_ratio_d); LOG_I(PHY,"UDP read thread %d, waiting for start sampling_rate_d %d, sampling_rate_n %d\n",u->thread_id,device->sampling_rate_ratio_n,device->sampling_rate_ratio_d);
while (fhstate->active > 0) { while (fhstate->active > 0) {
size_t count = recvfrom(((eth_state_t*)device->priv)->sockfdd[0], ssize_t count = recvfrom(((eth_state_t*)device->priv)->sockfdd[0],
buffer,sizeof(buffer),0, buffer,sizeof(buffer),0,
(struct sockaddr *)&((eth_state_t*)device->priv)->dest_addrd, (struct sockaddr *)&((eth_state_t*)device->priv)->dest_addrd,
(socklen_t *)&((eth_state_t*)device->priv)->addr_len); (socklen_t *)&((eth_state_t*)device->priv)->addr_len);
/* log and skip processing in case of error from recvfrom */
/* (to be refined if needed) */
if (count == 0) {
LOG_E(PHY, "recvfrom returned 0\n");
continue;
}
if (count < 0) {
LOG_E(PHY, "recvfrom failed (%s)\n", strerror(errno));
continue;
}
/* if oai_exit is 1 here, don't access the array rxbase, /* if oai_exit is 1 here, don't access the array rxbase,
* it may have been freed(), so let's break at this point * it may have been freed(), so let's break at this point
*/ */
@@ -460,7 +470,6 @@ void *udp_read_thread(void *arg) {
TS = *(openair0_timestamp *)(&buffer[ECPRICOMMON_BYTES+ECPRIPCID_BYTES]); TS = *(openair0_timestamp *)(&buffer[ECPRICOMMON_BYTES+ECPRIPCID_BYTES]);
// convert TS to samples, /6 for AW2S @ 30.72 Ms/s, this is converted for other sample rates in OAI application // convert TS to samples, /6 for AW2S @ 30.72 Ms/s, this is converted for other sample rates in OAI application
TS = (device->sampling_rate_ratio_n*TS)/(device->sampling_rate_ratio_d*6); TS = (device->sampling_rate_ratio_n*TS)/(device->sampling_rate_ratio_d*6);
if ((int)count <= 0) continue;
AssertFatal(aid < 8,"Cannot handle more than 8 antennas, got aid %d\n",aid); AssertFatal(aid < 8,"Cannot handle more than 8 antennas, got aid %d\n",aid);
fhstate->r[aid]=1; fhstate->r[aid]=1;
if (aid==0 && first_read == 0) fhstate->TS0 = TS; if (aid==0 && first_read == 0) fhstate->TS0 = TS;