Skip to content

Commit e2ff9cf

Browse files
steve-osteve-o
committed
Bump python to python3, Fedora does not include any "python" executable.
Add grp.h for Linux/setgroups API. Add comment based [[fallthrough]] to satisfy GCC.
1 parent 21d1983 commit e2ff9cf

23 files changed

+53
-37
lines changed

‎openpgm/pgm/SConscript.libpgm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ e.Append(CCFLAGS = '-DGETTEXT_PACKAGE=\'"pgm"\'');
6161
e.Command ('galois_tables.c', 'galois_generator.pl', "perl $SOURCE > $TARGET");
6262

6363
# Version stamping
64-
e.Command ('version.c', 'version_generator.py', "python $SOURCE > $TARGET");
64+
e.Command ('version.c', 'version_generator.py', "python3 $SOURCE > $TARGET");
6565
e.Depends ('version.c', src);
6666
src += ['version.c'];
6767

‎openpgm/pgm/engine.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
#ifndef _WIN32
3939
# include <netdb.h>
40+
# include <grp.h>
4041
#endif
4142
#include <impl/i18n.h>
4243
#include <impl/framework.h>

‎openpgm/pgm/examples/async.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ receiver_routine (
189189
pgm_getsockopt (async->sock, IPPROTO_PGM, PGM_TIME_REMAIN, &tv, &optlen);
190190
}
191191
goto block;
192+
/* fallthrough */
192193
case PGM_IO_STATUS_RATE_LIMITED:
193194
{
194195
socklen_t optlen = sizeof (tv);

‎openpgm/pgm/examples/daytime.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ main (
168168
case 'b':
169169
case 'B':
170170
proactive_packets = 1;
171+
/* fallthrough */
171172
case 'o':
172173
case 'O':
173174
use_ondemand_parity = TRUE;
@@ -319,8 +320,8 @@ create_sock (void)
319320
fprintf (stderr, "Parsing network parameter: %s\n", pgm_err->message);
320321
goto err_abort;
321322
} else {
322-
char network[1024];
323-
printf ("Network parameter: { %s }\n", pgm_addrinfo_to_string (res, network, sizeof (network)));
323+
char s[1024];
324+
printf ("Network parameter: { %s }\n", pgm_addrinfo_to_string (res, s, sizeof (s)));
324325
}
325326

326327
sa_family = res->ai_send_addrs[0].gsr_group.ss_family;

‎openpgm/pgm/examples/enonblocksyncrecv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ main (
187187
socklen_t optlen = sizeof (tv);
188188
pgm_getsockopt (g_sock, IPPROTO_PGM, PGM_RATE_REMAIN, &tv, &optlen);
189189
}
190-
/* fall through */
190+
/* fallthrough */
191191
case PGM_IO_STATUS_WOULD_BLOCK:
192192
/* poll for next event */
193193
block:

‎openpgm/pgm/examples/enonblocksyncrecvmsg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ main (
182182
socklen_t optlen = sizeof (tv);
183183
pgm_getsockopt (g_sock, IPPROTO_PGM, PGM_RATE_REMAIN, &tv, &optlen);
184184
}
185-
/* fall through */
185+
/* fallthrough */
186186
case PGM_IO_STATUS_WOULD_BLOCK:
187187
/* poll for next event */
188188
block:

‎openpgm/pgm/examples/enonblocksyncrecvmsgv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ main (
189189
socklen_t optlen = sizeof (tv);
190190
pgm_getsockopt (g_sock, IPPROTO_PGM, PGM_RATE_REMAIN, &tv, &optlen);
191191
}
192-
/* fall through */
192+
/* fallthrough */
193193
case PGM_IO_STATUS_WOULD_BLOCK:
194194
/* poll for next event */
195195
block:

‎openpgm/pgm/examples/pgmping.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@ receiver_thread (
12741274
break;
12751275
}
12761276
}
1277-
/* fall through */
1277+
/* fallthrough */
12781278
case PGM_IO_STATUS_WOULD_BLOCK:
12791279
//g_message ("would block");
12801280
block:

‎openpgm/pgm/examples/pgmrecv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ receiver_thread (
567567
socklen_t optlen = sizeof (tv);
568568
pgm_getsockopt (rx_sock, IPPROTO_PGM, PGM_RATE_REMAIN, &tv, &optlen);
569569
}
570-
/* fall through */
570+
/* fallthrough */
571571
case PGM_IO_STATUS_WOULD_BLOCK:
572572
block:
573573
#ifdef CONFIG_HAVE_EPOLL

‎openpgm/pgm/examples/pnonblocksyncrecv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ main (
178178
socklen_t optlen = sizeof (tv);
179179
pgm_getsockopt (g_sock, IPPROTO_PGM, PGM_RATE_REMAIN, &tv, &optlen);
180180
}
181-
/* fall through */
181+
/* fallthrough */
182182
case PGM_IO_STATUS_WOULD_BLOCK:
183183
/* poll for next event */
184184
block:

‎openpgm/pgm/examples/purinrecv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ main (
239239
socklen_t optlen = sizeof (tv);
240240
pgm_getsockopt (sock, IPPROTO_PGM, PGM_RATE_REMAIN, &tv, &optlen);
241241
}
242+
/* fallthrough */
242243
case PGM_IO_STATUS_WOULD_BLOCK:
243244
/* select for next event */
244245
block:

‎openpgm/pgm/examples/shortcakerecv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ on_startup (void)
292292
fprintf (stderr, "Parsing network parameter: %s\n", pgm_err->message);
293293
goto err_abort;
294294
} else {
295-
char network[1024];
296-
printf ("Network parameter: { %s }\n", pgm_addrinfo_to_string (res, network, sizeof (network)));
295+
char s[1024];
296+
printf ("Network parameter: { %s }\n", pgm_addrinfo_to_string (res, s, sizeof (s)));
297297
}
298298

299299
sa_family = res->ai_send_addrs[0].gsr_group.ss_family;

‎openpgm/pgm/examples/snonblocksyncrecv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ main (
207207
socklen_t optlen = sizeof (tv);
208208
pgm_getsockopt (g_sock, IPPROTO_PGM, PGM_RATE_REMAIN, &tv, &optlen);
209209
}
210-
/* fall through */
210+
/* fallthrough */
211211
case PGM_IO_STATUS_WOULD_BLOCK:
212212
/* select for next event */
213213
block:

‎openpgm/pgm/getnodeaddr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ pgm_getnodeaddr (
122122
t->ai_addrlen = ai->ai_addrlen;
123123
t->ai_addr = (struct sockaddr*)p;
124124
p += ai->ai_addrlen;
125-
t->ai_next = (NULL == ai->ai_next) ? NULL : p;
125+
t->ai_next = (NULL == ai->ai_next) ? NULL : (struct addrinfo*)p;
126126
}
127127
freeaddrinfo (result);
128128
*res = na;

‎openpgm/pgm/if.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#ifdef _AIX
3535
# define IP_MULTICAST
3636
#endif
37+
# include <arpa/inet.h>
3738
# include <sys/types.h>
3839
# include <sys/socket.h>
3940
# include <netdb.h> /* _GNU_SOURCE for EAI_NODATA */
@@ -162,11 +163,11 @@ pgm_gsr_to_string (
162163
)
163164
{
164165
char group[1024], source[1024], addr[1024];
165-
if (0 != pgm_sockaddr_ntop ((struct sockaddr*)&gsr->gsr_group, group, sizeof (group)))
166+
if (0 != pgm_sockaddr_ntop ((const struct sockaddr*)&gsr->gsr_group, group, sizeof (group)))
166167
group[0] = 0;
167-
if (0 != pgm_sockaddr_ntop ((struct sockaddr*)&gsr->gsr_source, source, sizeof (source)))
168+
if (0 != pgm_sockaddr_ntop ((const struct sockaddr*)&gsr->gsr_source, source, sizeof (source)))
168169
source[0] = 0;
169-
if (0 != pgm_sockaddr_ntop ((struct sockaddr*)&gsr->gsr_addr, addr, sizeof (addr)))
170+
if (0 != pgm_sockaddr_ntop ((const struct sockaddr*)&gsr->gsr_addr, addr, sizeof (addr)))
170171
addr[0] = 0;
171172
pgm_snprintf_s (text, len, _TRUNCATE, "gsr_interface = %u, gsr_group = \"%s\", gsr_source = \"%s\", gsr_addr = \"%s\"",
172173
gsr->gsr_interface, group, source, addr);
@@ -1205,7 +1206,7 @@ parse_group (
12051206
*/
12061207
for (res = result; NULL != res; res = res->ai_next)
12071208
{
1208-
if ((AF_INET6 != family && IN_MULTICAST(pgm_ntohl (((struct sockaddr_in*)res->ai_addr)->sin_addr.s_addr))) ||
1209+
if ((AF_INET6 != family && IN_MULTICAST(pgm_ntohl (((const struct sockaddr_in*)res->ai_addr)->sin_addr.s_addr))) ||
12091210
(AF_INET != family && IN6_IS_ADDR_MULTICAST(&((struct sockaddr_in6*)res->ai_addr)->sin6_addr)))
12101211
{
12111212
/* return first multicast result */
@@ -1446,7 +1447,7 @@ bind_gsr_to_interface (
14461447
struct pgm_group_source_req* gsr = gsr_list->data;
14471448
/* interface is a tuple of {index, address} in order to support modern IP stacks with IP aliasing. */
14481449
gsr->gsr_interface = ir->ir_interface;
1449-
memcpy (&gsr->gsr_addr, &ir->ir_addr, pgm_sockaddr_len ((struct sockaddr*)&ir->ir_addr));
1450+
memcpy (&gsr->gsr_addr, &ir->ir_addr, pgm_sockaddr_len ((const struct sockaddr*)&ir->ir_addr));
14501451
gsr_list = gsr_list->next;
14511452
}
14521453
return TRUE;
@@ -1554,8 +1555,8 @@ resolve_interface (
15541555
{
15551556
{
15561557
char s[INET6_ADDRSTRLEN];
1557-
if (0 != pgm_sockaddr_ntop (&resolved_interface.ir_addr, s, sizeof(s)))
1558-
s[0] == 0;
1558+
if (0 != pgm_sockaddr_ntop ((struct sockaddr*)&resolved_interface.ir_addr, s, sizeof(s)))
1559+
s[0] = 0;
15591560
pgm_debug ("Interface \"%s\" detected as \"%s\".", ir->ir_name ? ir->ir_name : "", s);
15601561
}
15611562
ir->ir_interface = resolved_interface.ir_interface;
@@ -1654,7 +1655,7 @@ parse_receive_entity (
16541655
if (NULL == entity) {
16551656
struct pgm_group_source_req* gsr = pgm_new0 (struct pgm_group_source_req, 1);
16561657
gsr->gsr_interface = ((struct interface_req*)(*interface_list)->data)->ir_interface;
1657-
if (!set_default_multicast_group (family, &gsr->gsr_group)) {
1658+
if (!set_default_multicast_group (family, (struct sockaddr*)&gsr->gsr_group)) {
16581659
pgm_set_error (error,
16591660
PGM_ERROR_DOMAIN_IF,
16601661
PGM_ERROR_INVAL,
@@ -1772,7 +1773,7 @@ parse_send_entity (
17721773
/* default send object */
17731774
send_gsr = pgm_new0 (struct pgm_group_source_req, 1);
17741775
send_gsr->gsr_interface = primary_interface->ir_interface;
1775-
memcpy (&send_gsr->gsr_addr, &primary_interface->ir_addr, pgm_sockaddr_len ((struct sockaddr*)&primary_interface->ir_addr));
1776+
memcpy (&send_gsr->gsr_addr, &primary_interface->ir_addr, pgm_sockaddr_len ((const struct sockaddr*)&primary_interface->ir_addr));
17761777
if (!parse_group (family, entity, (struct sockaddr*)&send_gsr->gsr_group, error))
17771778
{
17781779
pgm_prefix_error (error,
@@ -2005,6 +2006,7 @@ network_parse (
20052006
}
20062007
pgm_clear_error (&sub_error);
20072008
ec++;
2009+
/* fallthrough */
20082010

20092011
case ENTITY_RECEIVE:
20102012
if (!parse_receive_entity (family, entity, &source_list, recv_list, error))
@@ -2065,6 +2067,7 @@ network_parse (
20652067
goto free_lists;
20662068
}
20672069
ec++;
2070+
/* fallthrough */
20682071

20692072
case ENTITY_RECEIVE:
20702073
if (!parse_receive_entity (family, b, &source_list, recv_list, error))

‎openpgm/pgm/include/impl/checksum.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@
3030
#define __PGM_IMPL_CHECKSUM_H__
3131

3232
#include <pgm/types.h>
33+
#include <impl/cpu.h>
3334

3435
PGM_BEGIN_DECLS
3536

37+
PGM_GNUC_INTERNAL void pgm_checksum_init (const pgm_cpu_t* cpu);
3638
uint16_t pgm_inet_checksum (const void*, uint16_t, uint16_t);
3739
uint16_t pgm_csum_fold (uint32_t) PGM_GNUC_CONST;
3840
uint32_t pgm_csum_block_add (uint32_t, uint32_t, const uint16_t) PGM_GNUC_CONST;

‎openpgm/pgm/include/impl/wsastrerror.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@
3131

3232
PGM_BEGIN_DECLS
3333

34-
char* pgm_wsastrerror (const int);
35-
char* pgm_adapter_strerror (const int);
34+
const char* pgm_wsastrerror (const int);
35+
const char* pgm_adapter_strerror (const int);
36+
/* non-const, result must be freed. */
3637
char* pgm_win_strerror (char*, size_t, const int);
3738

3839
PGM_END_DECLS

‎openpgm/pgm/receiver.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,9 +1367,9 @@ send_ack (
13671367
opt_len->opt_length = sizeof(struct pgm_opt_length);
13681368
opt_len->opt_total_length = pgm_htons ( sizeof(struct pgm_opt_length) +
13691369
sizeof(struct pgm_opt_header) +
1370-
(AF_INET6 == sock->send_addr.ss_family) ?
1370+
( (AF_INET6 == sock->send_addr.ss_family) ?
13711371
sizeof(struct pgm_opt6_pgmcc_feedback) :
1372-
sizeof(struct pgm_opt_pgmcc_feedback) );
1372+
sizeof(struct pgm_opt_pgmcc_feedback) ) );
13731373
opt_header = (struct pgm_opt_header*)(opt_len + 1);
13741374
opt_header->opt_type = PGM_OPT_PGMCC_FEEDBACK | PGM_OPT_END;
13751375
opt_header->opt_length = sizeof(struct pgm_opt_header) +

‎openpgm/pgm/rxw.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ pgm_rxw_add (
372372
}
373373

374374
const struct pgm_sk_buff_t* const first_skb = _pgm_rxw_peek (window, _pgm_rxw_tg_sqn (window, skb->sequence));
375-
const pgm_rxw_state_t* const first_state = (pgm_rxw_state_t*)&first_skb->cb;
375+
const pgm_rxw_state_t* const first_state = (const pgm_rxw_state_t*)&first_skb->cb;
376376

377377
if (_pgm_rxw_tg_sqn (window, skb->sequence) == _pgm_rxw_tg_sqn (window, window->lead)) {
378378
window->has_event = 1;
@@ -801,7 +801,7 @@ _pgm_rxw_is_apdu_lost (
801801
if (NULL == first_skb)
802802
return TRUE;
803803

804-
const pgm_rxw_state_t* first_state = (pgm_rxw_state_t*)&first_skb->cb;
804+
const pgm_rxw_state_t* first_state = (const pgm_rxw_state_t*)&first_skb->cb;
805805
if (PGM_PKT_STATE_LOST_DATA == first_state->pkt_state)
806806
return TRUE;
807807

@@ -1255,7 +1255,8 @@ pgm_rxw_readv (
12551255
} else {
12561256
pgm_trace (PGM_LOG_ROLE_RX_WINDOW,_("Locking trail at commit window"));
12571257
}
1258-
/* fall through */
1258+
/* fallthrough */
1259+
12591260
case PGM_PKT_STATE_BACK_OFF:
12601261
case PGM_PKT_STATE_WAIT_NCF:
12611262
case PGM_PKT_STATE_WAIT_DATA:
@@ -1453,6 +1454,8 @@ _pgm_rxw_reconstruct (
14531454
tg_opts[ window->rs.k + rs_h ] = (pgm_gf8_t*)skb->pgm_opt_fragment;
14541455
offsets[ j ] = window->rs.k + rs_h;
14551456
++rs_h;
1457+
/* fallthrough */
1458+
14561459
/* fall through and alloc new skb for reconstructed data */
14571460
case PGM_PKT_STATE_BACK_OFF:
14581461
case PGM_PKT_STATE_WAIT_NCF:
@@ -2053,8 +2056,8 @@ _pgm_rxw_recovery_update (
20532056
case PGM_PKT_STATE_BACK_OFF:
20542057
case PGM_PKT_STATE_WAIT_NCF:
20552058
pgm_rxw_state (window, skb, PGM_PKT_STATE_WAIT_DATA);
2059+
/* fallthrough */
20562060

2057-
/* fall through */
20582061
case PGM_PKT_STATE_WAIT_DATA:
20592062
state->timer_expiry = nak_rdata_expiry;
20602063
return PGM_RXW_UPDATED;

‎openpgm/pgm/sockaddr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ pgm_in_len2mask (
208208
uint8_t* p;
209209

210210
p = (uint8_t*)mask;
211-
memset (mask, sizeof (*mask), 0);
211+
memset (mask, 0, sizeof (*mask));
212212
for (i = 0; i < prefixlen / 8; i++)
213213
p[i] = 0xff;
214214
if (prefixlen % 8)

‎openpgm/pgm/socket.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2269,7 +2269,7 @@ pgm_bind3 (
22692269
memset (&send_addr, 0, sizeof(send_addr));
22702270

22712271
if (send_req->ir_address.ss_family != AF_UNSPEC)
2272-
memcpy(&send_addr, &send_req->ir_address, pgm_sockaddr_len ((struct sockaddr *)&send_req->ir_address));
2272+
memcpy(&send_addr, &send_req->ir_address, pgm_sockaddr_len ((const struct sockaddr *)&send_req->ir_address));
22732273
else if (!pgm_if_indextoaddr (send_req->ir_interface,
22742274
sock->family,
22752275
send_req->ir_scope_id,

‎openpgm/pgm/txw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ pgm_txw_add (
307307
pgm_assert ((char*)skb->data > (char*)skb->head);
308308
pgm_assert ((sizeof(struct pgm_header) + sizeof(struct pgm_data)) <= (size_t)((char*)skb->data - (char*)skb->head));
309309

310-
pgm_debug ("add (window:%p skb:%p)", (const char*)window, (const char*)skb);
310+
pgm_debug ("add (window:%p skb:%p)", (const void*)window, (const void*)skb);
311311

312312
if (pgm_txw_is_full (window))
313313
{

‎openpgm/pgm/wsastrerror.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,21 @@
2727

2828
/* compatibility stubs */
2929

30-
char *
30+
const char*
3131
pgm_wsastrerror (
3232
const int wsa_errnum
3333
)
3434
{
35+
(void)wsa_errnum;
3536
return _("Unknown.");
3637
}
3738

38-
char*
39+
const char*
3940
pgm_adapter_strerror (
4041
const int adapter_errnum
4142
)
4243
{
44+
(void)adapter_errnum;
4345
return _("Unknown.");
4446
}
4547

@@ -50,14 +52,15 @@ pgm_win_strerror (
5052
const int win_errnum
5153
)
5254
{
55+
(void)win_errnum;
5356
pgm_strncpy_s (buf, buflen, _("Unknown."), _TRUNCATE);
5457
return buf;
5558
}
5659

5760
#else
5861
# include <ws2tcpip.h>
5962

60-
char*
63+
const char*
6164
pgm_wsastrerror (
6265
const int wsa_errnum
6366
)
@@ -352,7 +355,7 @@ pgm_wsastrerror (
352355
}
353356
}
354357

355-
char*
358+
const char*
356359
pgm_adapter_strerror (
357360
const int adapter_errnum
358361
)

0 commit comments

Comments
 (0)