Skip to content

Commit dac86f6

Browse files
giro94giro94
committed
Updated clang brace wrapping rule
1 parent 219b3e2 commit dac86f6

File tree

3 files changed

+81
-160
lines changed

3 files changed

+81
-160
lines changed

‎test/ots_udp_hw_emulator.cpp‎

Lines changed: 32 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,16 @@ using namespace std;
4545
#define EMULATOR_PORT "4950" // Can be also passed as first argument
4646

4747
// get sockaddr, IPv4 or IPv6:
48-
void* get_in_addr(struct sockaddr* sa)
49-
{
50-
if(sa->sa_family == AF_INET)
51-
{
48+
void* get_in_addr(struct sockaddr* sa) {
49+
if(sa->sa_family == AF_INET) {
5250
return &(((struct sockaddr_in*)sa)->sin_addr);
5351
}
5452

5553
return &(((struct sockaddr_in6*)sa)->sin6_addr);
5654
}
5755

5856
//==============================================================================
59-
int makeSocket(const char* ip, int port, struct sockaddr_in& ai_addr)
60-
{
57+
int makeSocket(const char* ip, int port, struct sockaddr_in& ai_addr) {
6158
int sockfd;
6259
struct addrinfo hints, *servinfo, *p;
6360
int rv;
@@ -70,26 +67,22 @@ int makeSocket(const char* ip, int port, struct sockaddr_in& ai_addr)
7067
hints.ai_family = AF_UNSPEC;
7168
hints.ai_socktype = SOCK_DGRAM;
7269

73-
if((rv = getaddrinfo(ip, std::to_string(port).c_str(), &hints, &servinfo)) != 0)
74-
{
70+
if((rv = getaddrinfo(ip, std::to_string(port).c_str(), &hints, &servinfo)) != 0) {
7571
__SS__ << "getaddrinfo: " << gai_strerror(rv) << __E__;
7672
__SS_THROW__;
7773
}
7874

7975
// loop through all the results and make a socket
80-
for(p = servinfo; p != NULL; p = p->ai_next)
81-
{
82-
if((sockfd = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1)
83-
{
76+
for(p = servinfo; p != NULL; p = p->ai_next) {
77+
if((sockfd = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1) {
8478
__COUT_WARN__ << "sw: socket failed, trying other address..." << __E__;
8579
continue;
8680
}
8781

8882
break;
8983
}
9084

91-
if(p == NULL)
92-
{
85+
if(p == NULL) {
9386
__SS__ << "sw: failed to create socket" << __E__;
9487
__SS_THROW__;
9588
}
@@ -101,8 +94,7 @@ int makeSocket(const char* ip, int port, struct sockaddr_in& ai_addr)
10194
return sockfd;
10295
} // end makeSocket()
10396

104-
int main(int argc, char** argv)
105-
{
97+
int main(int argc, char** argv) {
10698
std::string emulatorPort(EMULATOR_PORT);
10799
if(argc == 2)
108100
emulatorPort = argv[1];
@@ -129,23 +121,19 @@ int main(int argc, char** argv)
129121
hints.ai_socktype = SOCK_DGRAM;
130122
hints.ai_flags = AI_PASSIVE; // use my IP
131123

132-
if((rv = getaddrinfo(NULL, emulatorPort.c_str(), &hints, &servinfo)) != 0)
133-
{
124+
if((rv = getaddrinfo(NULL, emulatorPort.c_str(), &hints, &servinfo)) != 0) {
134125
fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(rv));
135126
return 1;
136127
}
137128

138129
// loop through all the results and bind to the first we can
139-
for(p = servinfo; p != NULL; p = p->ai_next)
140-
{
141-
if((sockfd = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1)
142-
{
130+
for(p = servinfo; p != NULL; p = p->ai_next) {
131+
if((sockfd = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1) {
143132
perror("listener: socket");
144133
continue;
145134
}
146135

147-
if(bind(sockfd, p->ai_addr, p->ai_addrlen) == -1)
148-
{
136+
if(bind(sockfd, p->ai_addr, p->ai_addrlen) == -1) {
149137
close(sockfd);
150138
perror("listener: bind");
151139
continue;
@@ -154,8 +142,7 @@ int main(int argc, char** argv)
154142
break;
155143
}
156144

157-
if(p == NULL)
158-
{
145+
if(p == NULL) {
159146
fprintf(stderr, "listener: failed to bind socket\n");
160147

161148
__COUT__ << "\n\nYou can try a different port by passing an argument.\n\n";
@@ -212,16 +199,14 @@ int main(int argc, char** argv)
212199
int handlerIndex;
213200
int totalNumberOfBytes;
214201

215-
while(1)
216-
{
202+
while(1) {
217203
usleep(3000); // sleep 3ms to free up processor (downfall is less
218204
// responsive, but likely not noticeable)
219205

220206
readfds = masterfds; // copy to reset timeout select
221207
select(sockfd + 1, &readfds, NULL, NULL, &tv);
222208

223-
if(FD_ISSET(sockfd, &readfds))
224-
{
209+
if(FD_ISSET(sockfd, &readfds)) {
225210
// packet received
226211
__COUT__ << std::hex << ":::"
227212
<< "Packet Received!" << std::endl;
@@ -232,8 +217,7 @@ int main(int argc, char** argv)
232217
MAXBUFLEN - 1,
233218
0,
234219
(struct sockaddr*)&their_addr,
235-
&addr_len)) == -1)
236-
{
220+
&addr_len)) == -1) {
237221
perror("recvfrom");
238222
exit(1);
239223
}
@@ -266,16 +250,14 @@ int main(int argc, char** argv)
266250
(numberOfBytes = (buff[handlerIndex + 0]
267251
? 18
268252
: 10)) && // assume write is 18 and read is 10
269-
handlerIndex + numberOfBytes <= totalNumberOfBytes)
270-
{
253+
handlerIndex + numberOfBytes <= totalNumberOfBytes) {
271254
__COUT__ << ":::"
272255
<< "hw: packet byte index " << handlerIndex << std::endl;
273256
__COUT__ << ":::"
274257
<< "hw: packet is " << numberOfBytes << " bytes long"
275258
<< std::endl;
276259

277-
for(int i = 0; i < numberOfBytes; i++)
278-
{
260+
for(int i = 0; i < numberOfBytes; i++) {
279261
if((i - RX_ADDR_OFFSET) % 8 == 0)
280262
__PRINTF__("\n");
281263
__PRINTF__("%2.2X", (unsigned char)buff[handlerIndex + i]);
@@ -344,19 +326,17 @@ int main(int argc, char** argv)
344326
packetSz,
345327
0,
346328
(struct sockaddr*)&their_addr,
347-
sizeof(struct sockaddr_storage))) == -1)
348-
{
329+
sizeof(struct sockaddr_storage))) == -1) {
349330
perror("hw: sendto");
350331
exit(1);
351332
}
352333
__PRINTF__("hw: sent %d bytes back. sequence=%d\n",
353334
numberOfBytes,
354335
(unsigned char)buff[handlerIndex + 1]);
355-
}
356-
else if(numberOfBytes >= 18 &&
357-
(numberOfBytes - 2) % 8 ==
358-
0 && // size is valid (multiple of 8 data)
359-
buff[handlerIndex + 0] == 1) // write
336+
} else if(numberOfBytes >= 18 &&
337+
(numberOfBytes - 2) % 8 ==
338+
0 && // size is valid (multiple of 8 data)
339+
buff[handlerIndex + 0] == 1) // write
360340
{
361341
uint64_t addr;
362342
memcpy((void*)&addr, (void*)&buff[handlerIndex + RX_ADDR_OFFSET], 8);
@@ -406,8 +386,7 @@ int main(int argc, char** argv)
406386
__COUT__ << std::hex << ":::"
407387
<< "Stream destination IP: " << streamToIP << std::endl;
408388
__COUT__ << streamToIP << std::endl;
409-
}
410-
break;
389+
} break;
411390
case 0x0000000100000007:
412391
__COUT__ << std::hex << ":::"
413392
<< "Destination MAC address ignored!" << std::endl;
@@ -426,8 +405,7 @@ int main(int argc, char** argv)
426405
sendSockfd = -1;
427406
sendSockfd =
428407
makeSocket(streamToIP.c_str(), streamToPort, ai_addr); // p);
429-
if(sendSockfd != -1)
430-
{
408+
if(sendSockfd != -1) {
431409
__COUT__ << "************************************************"
432410
"********"
433411
<< endl;
@@ -443,8 +421,7 @@ int main(int argc, char** argv)
443421
__COUT__ << "************************************************"
444422
"********"
445423
<< endl;
446-
}
447-
else
424+
} else
448425
__COUT__ << std::hex << ":::"
449426
<< "Failed to create streaming socket to ip: "
450427
<< streamToIP << " port: 0x" << streamToPort << endl;
@@ -463,8 +440,7 @@ int main(int argc, char** argv)
463440
__COUT__ << std::hex << ":::"
464441
<< "Unknown write address received." << endl;
465442
}
466-
}
467-
else
443+
} else
468444
__COUT__ << std::hex << ":::"
469445
<< "ERROR: The formatting of the string received is wrong! "
470446
"Number of bytes: "
@@ -479,14 +455,12 @@ int main(int argc, char** argv)
479455
<< addressSpaceSS.str() << "\n\n";
480456

481457
} // end packet received if
482-
else
483-
{
458+
else {
484459
// no packet received (timeout)
485460

486461
//__COUT__ << "[" << __LINE__ << "]Is burst enabled? " << (int)dataEnabled
487462
//<< endl;
488-
if((int)dataEnabled)
489-
{
463+
if((int)dataEnabled) {
490464
// generate data
491465
//__COUT__ << "[" << __LINE__ << "]Count? " << count << " rate: " <<
492466
// data_gen_rate << " counter: " << data_gen_cnt << endl;
@@ -534,8 +508,7 @@ int main(int argc, char** argv)
534508
}
535509

536510
wasDataEnable = true;
537-
}
538-
else if(wasDataEnable) // send last in burst packet
511+
} else if(wasDataEnable) // send last in burst packet
539512
{
540513
wasDataEnable = false;
541514
__COUT__ << std::hex << ":::"
@@ -549,8 +522,7 @@ int main(int argc, char** argv)
549522

550523
packetSz = TX_DATA_OFFSET + 8; // only response with 1 QW
551524

552-
if(sendSockfd != -1)
553-
{
525+
if(sendSockfd != -1) {
554526
if((numberOfBytes = sendto(
555527
sendSockfd, buff, packetSz, 0, (struct sockaddr*)&ai_addr, sizeof(ai_addr)) == //p->ai_addr, p->ai_addrlen)) ==
556528
-1)
@@ -561,8 +533,7 @@ int main(int argc, char** argv)
561533
__PRINTF__("hw: sent %d bytes back. sequence=%d\n",
562534
numberOfBytes,
563535
(unsigned char)buff[1]);
564-
}
565-
else
536+
} else
566537
__COUT__ << std::hex << ":::"
567538
<< "Send socket not defined." << endl;
568539
}

0 commit comments

Comments
 (0)