Osmocom Open Build Service

libosmo-netif.spec Changed

libosmo-netif_1.6.0.dsc -> libosmo-netif_1.6.1.dsc Changed

libosmo-netif_1.6.0.tar.xz/.tarball-version -> libosmo-netif_1.6.1.tar.xz/.tarball-version Changed

libosmo-netif_1.6.0.tar.xz/debian/changelog -> libosmo-netif_1.6.1.tar.xz/debian/changelog Changed

libosmo-netif_1.6.0.tar.xz/examples/ipa-stream-client.c -> libosmo-netif_1.6.1.tar.xz/examples/ipa-stream-client.c Changed

libosmo-netif_1.6.0.tar.xz/src/Makefile.am -> libosmo-netif_1.6.1.tar.xz/src/Makefile.am Changed

libosmo-netif_1.6.0.tar.xz/src/jibuf.c -> libosmo-netif_1.6.1.tar.xz/src/jibuf.c Changed

libosmo-netif_1.6.0.tar.xz/tests/jibuf/jibuf_test.c -> libosmo-netif_1.6.1.tar.xz/tests/jibuf/jibuf_test.c Changed

libosmo-netif_1.6.0.tar.xz/tests/jibuf/jibuf_tool.c -> libosmo-netif_1.6.1.tar.xz/tests/jibuf/jibuf_tool.c Changed

@@ -168,7 +168,7 @@
 	LOGP(DLJIBUF, LOGL_DEBUG, "%s: seq=%"PRIu16" ts=%"PRIu32" (%ld.%06ld) tx_delay=%"PRIu32 \
 		" end_delay=%"PRIu32" pre_trans=%d pre_jitter=%f post_trans=%d post_jitter=%f skew=%"PRId32"\n",
 		info, ntohs(rtph->sequence), ntohl(rtph->timestamp),
-		pinfo->tx_time.tv_sec, pinfo->tx_time.tv_usec,
+		(unsigned int long) pinfo->tx_time.tv_sec, (unsigned int long) pinfo->tx_time.tv_usec,
 		pinfo->tx_delay, total_delay_ms,
 		pinfo->prequeue.transit, pinfo->prequeue.jitter,
 		pinfo->postqueue.transit, pinfo->postqueue.jitter, pinfo->skew_us);
@@ -179,7 +179,7 @@
 		" pre_trans=%d pre_jitter=%f post_trans=%d post_jitter=%f dropped=%"PRIu32 \
 		" buffer=%"PRIu32"\n",
 		ntohs(rtph->sequence), ntohl(rtph->timestamp),
-		pinfo->tx_time.tv_sec, pinfo->tx_time.tv_usec,
+		(unsigned int long) pinfo->tx_time.tv_sec, (unsigned int long) pinfo->tx_time.tv_usec,
 		pinfo->tx_delay, total_delay_ms,
 		pinfo->prequeue.transit, pinfo->prequeue.jitter,
 		pinfo->postqueue.transit, pinfo->postqueue.jitter,

libosmo-netif_1.6.0.tar.xz/tests/osmo-pcap-test/pcap.c -> libosmo-netif_1.6.1.tar.xz/tests/osmo-pcap-test/pcap.c Changed

libosmo-netif_1.6.0.tar.xz/tests/osmux/osmux_input_test.c -> libosmo-netif_1.6.1.tar.xz/tests/osmux/osmux_input_test.c Changed

libosmo-netif_1.6.0.tar.xz/tests/osmux/osmux_output_test.c -> libosmo-netif_1.6.1.tar.xz/tests/osmux/osmux_output_test.c Changed

libosmo-netif_1.6.0.tar.xz/tests/osmux/osmux_test.c -> libosmo-netif_1.6.1.tar.xz/tests/osmux/osmux_test.c Changed

libosmo-netif_1.6.0.tar.xz/tests/stream/stream_test.c -> libosmo-netif_1.6.1.tar.xz/tests/stream/stream_test.c Changed

@@ -65,7 +65,8 @@
 #define LOGCLI(cli, fmt, args...) do { \
 		struct timeval tv; \
 		osmo_gettimeofday(&tv, NULL); \
-		printf("{%lu.%06lu} %s Client's %s(): " fmt, tv.tv_sec, tv.tv_usec, \
+		printf("{%lu.%06lu} %s Client's %s(): " fmt, \
+		       (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec, \
 		       osmo_stream_cli_get_data(cli) ? "OK" : "NA", __func__, ##args); \
 	} while (0)
 
@@ -243,7 +244,8 @@
 #define LOGSRV(srv, fmt, args...) do { \
 		struct timeval tv; \
 		osmo_gettimeofday(&tv, NULL); \
-		printf("{%lu.%06lu} %s|%s Server's %s(): " fmt,  tv.tv_sec, tv.tv_usec, \
+		printf("{%lu.%06lu} %s|%s Server's %s(): " fmt, \
+		       (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec, \
 		       osmo_stream_srv_get_data(srv) ? "OK" : "NA", \
 		       osmo_stream_srv_link_get_data(osmo_stream_srv_get_master(srv)) ? "OK" : "NA", \
 		       __func__, ##args); \
@@ -364,21 +366,24 @@
 		osmo_select_main(0);
 		osmo_gettimeofday(&tv, NULL);
 		fprintf(stderr, "\n{%lu.%06lu} %s test step %u client %s, server %s, FD reg %u\n",
-			tv.tv_sec, tv.tv_usec, ASTR(autoreconnect), steps,
+			(unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec,
+			ASTR(autoreconnect), steps,
 			osmo_stream_cli_get_data(cli) ? "OK" : "NA",
 			osmo_stream_srv_link_get_data(lnk) ? "OK" : "NA",
 			osmo_fd_is_registered(osmo_stream_cli_get_ofd(cli)));
 
 		if (test_stop_requested(lnk)) {
 			printf("{%lu.%06lu} Server requested test termination\n",
-			       tv.tv_sec, tv.tv_usec);
+			       (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec);
 			steps = 0;
 		}
 	}
 
 	osmo_stream_cli_destroy(cli);
 	osmo_stream_srv_link_close(lnk);
-	printf("{%lu.%06lu} %s test complete.\n\n", tv.tv_sec, tv.tv_usec, ASTR(autoreconnect));
+	printf("{%lu.%06lu} %s test complete.\n\n",
+	       (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec,
+	       ASTR(autoreconnect));
 }
 
 /* Segmentation test code (using IPA) */
@@ -740,7 +745,7 @@
 		fprintf(stderr, "Cannot allocate message\n");
 		return -ENOMEM;
 	}
-	LOGSRV(conn, "Received message from stream (total len including stripped headers = %lu)\n",
+	LOGSRV(conn, "Received message from stream (total len including stripped headers = %zu)\n",
 	       osmo_ntohs(h->len) + sizeof(*h));
 	if (5 < ipa_msg_type) {
 		fprintf(stderr, "Received unexpected IPAC message type %"PRIu8"\n", ipa_msg_type);

libosmo-netif_1.6.0.tar.xz/utils/osmo-amr-inspect.c -> libosmo-netif_1.6.1.tar.xz/utils/osmo-amr-inspect.c Changed

@@ -73,7 +73,7 @@
 	printf("  F: %u\n", hdr->f);
 	printf("  FT: %u (%s)\n", hdr->ft, osmo_amr_type_name(hdr->ft));
 	printf("  Q: %u\n", hdr->q);
-	printf("  Payload (%lu bytes): %s\n",
+	printf("  Payload (%zu bytes): %s\n",
 	       buf_len - sizeof(*hdr), osmo_hexdump_nospc(payload, payload_len));
 
 	if (hdr->f)
@@ -88,11 +88,11 @@
 		println_orange("  WARN: PAD2=0x%x not zero!", hdr->pad2);
 	ft_bytes = osmo_amr_bytes(hdr->ft);
 	if (payload_len != ft_bytes) {
-		println_red("  ERROR: Wrong payload byte-length %lu != exp %lu!", payload_len, ft_bytes);
+		println_red("  ERROR: Wrong payload byte-length %zu != exp %zu!", payload_len, ft_bytes);
 	} else {
 		ft_bits = osmo_amr_bits(hdr->ft);
 		if (ft_bits/8 == ft_bytes) {
-			printf("  Payload has no padding (%lu bits)\n", ft_bits);
+			printf("  Payload has no padding (%zu bits)\n", ft_bits);
 		} else {
 			uint8_t last_byte = payloadpayload_len - 1;
 			uint8_t padding = last_byte & (0xff >> (ft_bits & 3));
@@ -117,7 +117,7 @@
 	printf("  FT: %u (%s)\n", ft, osmo_amr_type_name(ft));
 	printf("  Q: %u\n", hdr->q);
 	printf("  Payload first 6 bits: 0x%02x\n", hdr->data_start);
-	printf("  Payload continuation (%lu bytes): %s\n", buf_len - sizeof(*hdr),
+	printf("  Payload continuation (%zu bytes): %s\n", buf_len - sizeof(*hdr),
 	       osmo_hexdump_nospc(buf + sizeof(*hdr), buf_len - sizeof(*hdr)));
 
 	if (hdr->f)
@@ -130,12 +130,12 @@
 	}
 	ft_bits = osmo_amr_bits(ft);
 	if (ft_bits != payload_len_bits) {
-		println_red("  ERROR: Wrong payload bits-length %lu != exp %lu! (FT=%u)\n", payload_len_bits, ft_bits, ft);
+		println_red("  ERROR: Wrong payload bits-length %zu != exp %zu! (FT=%u)\n", payload_len_bits, ft_bits, ft);
 		return;
 	}
 
 	if (!((AMR_HDR_BWE_LEN_BITS + ft_bits) & 0x03)) {
-		printf("  Payload has no padding (%lu bits with offset 10)\n", ft_bits);
+		printf("  Payload has no padding (%zu bits with offset 10)\n", ft_bits);
 	} else {
 		uint8_t last_byte = bufbuf_len - 1;
 		uint8_t padding = last_byte & (0xff >> ((AMR_HDR_BWE_LEN_BITS + ft_bits) & 0x03));
@@ -156,7 +156,7 @@
 static void inspect_amr(unsigned int i, const uint8_t *buf, size_t buf_len)
 {
 	bool is_oa;
-	printf("%u Buffer (%lu bytes): %s\n", i, buf_len, osmo_hexdump_nospc(buf, buf_len));
+	printf("%u Buffer (%zu bytes): %s\n", i, buf_len, osmo_hexdump_nospc(buf, buf_len));
 	is_oa = osmo_amr_is_oa(buf, buf_len);
 	switch (force_fmt) {
 	case FORCE_AMR_INPUT_FMT_AUTO:
@@ -253,7 +253,7 @@
 	hex_bufhex_buflen = '\0';
 
 	if (hex_buflen == sizeof(hex_buf) - 1) {
-		fprintf(stderr, "Failed parsing (input too long > %lu): %s\n", hex_buflen, hex_buf);
+		fprintf(stderr, "Failed parsing (input too long > %zu): %s\n", hex_buflen, hex_buf);
 		return -ENOMEM;
 	}
 
@@ -263,7 +263,7 @@
 		return -1;
 	}
 	if (rc < 2) {
-		fprintf(stderr, "Too short to be an AMR buffer (%ld bytes): %s\n", rc, hex_buf);
+		fprintf(stderr, "Too short to be an AMR buffer (%zu bytes): %s\n", rc, hex_buf);
 		return -1;
 	}

Changes of Revision 9