diff options
| author |   David Johnson <davijoh3@cisco.com> | 2018-12-14 14:53:41 -0500 |
|---|---|---|
| committer | David Johnson <davijoh3@cisco.com> | 2019-01-02 10:55:55 -0500 |
| commit | d9818dd68c162079f3ddb5443a78d0d91d55d0fe (patch) | |
| tree | 71a597e8fb2c9c7ebd70870ae78091872591e216 /src/tests/vnet | |
| parent | d6897c1597c4f0904d5956f7d794e3f001d52f72 (diff) | |
Fixes for buliding for 32bit targets:
* u32/u64/uword mismatches
* pointer-to-int fixes
* printf formatting issues
* issues with incorrect "ULL" and related suffixes
* structure alignment and padding issues
Change-Id: I70b989007758755fe8211c074f651150680f60b4
Signed-off-by: David Johnson <davijoh3@cisco.com>
Diffstat (limited to 'src/tests/vnet')
| -rw-r--r-- | src/tests/vnet/session/tcp_echo.c | 2 | ||||
| -rw-r--r-- | src/tests/vnet/session/udp_echo.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/tests/vnet/session/tcp_echo.c b/src/tests/vnet/session/tcp_echo.c index e553a3ac9fa..1f49ab69e77 100644 --- a/src/tests/vnet/session/tcp_echo.c +++ b/src/tests/vnet/session/tcp_echo.c @@ -1408,7 +1408,7 @@ main (int argc, char **argv) clib_time_init (&em->clib_time); init_error_string_table (em); - svm_fifo_segment_main_init (sm, 0x200000000ULL, 20); + svm_fifo_segment_main_init (sm, HIGH_SEGMENT_BASEVA, 20); unformat_init_command_line (a, argv); while (unformat_check_input (a) != UNFORMAT_END_OF_INPUT) diff --git a/src/tests/vnet/session/udp_echo.c b/src/tests/vnet/session/udp_echo.c index b8c4c5daf31..813aee22264 100644 --- a/src/tests/vnet/session/udp_echo.c +++ b/src/tests/vnet/session/udp_echo.c @@ -942,7 +942,8 @@ vl_api_unmap_segment_t_handler (vl_api_unmap_segment_t * mp) udp_echo_main_t *utm = &udp_echo_main; svm_fifo_segment_main_t *sm = &utm->segment_main; svm_fifo_segment_private_t *seg; - u64 *seg_indexp, segment_handle; + uword *seg_indexp; + u64 segment_handle; segment_handle = clib_net_to_host_u64 (mp->segment_handle); seg_indexp = hash_get (utm->segments_table, segment_handle); @@ -1220,7 +1221,7 @@ main (int argc, char **argv) clib_mem_init_thread_safe (0, 256 << 20); - svm_fifo_segment_main_init (sm, 0x200000000ULL, 20); + svm_fifo_segment_main_init (sm, HIGH_SEGMENT_BASEVA, 20); vec_validate (utm->rx_buf, 128 << 10); utm->session_index_by_vpp_handles = hash_create (0, sizeof (uword)); |