message
stringlengths
6
474
diff
stringlengths
8
5.22k
the short address is txed in the correct order
@@ -211,8 +211,8 @@ owerror_t openserial_printData(uint8_t* buffer, uint8_t length) { openserial_vars.outputBufFilled = TRUE; outputHdlcOpen(); outputHdlcWrite(SERFRAME_MOTE2PC_DATA); - outputHdlcWrite(idmanager_getMyID(ADDR_16B)->addr_16b[1]); outputHdlcWrite(idmanager_getMyID(ADDR_16B)->addr_16b[0]); + outputHdlcWrite(idmanager_getMyID(ADDR_16B)->addr_16b[1]); outputHdlcWrite(asn[0]); outputHdlcWrite(asn[1]); outputHdlcWrite(asn[2]); @@ -235,8 +235,8 @@ owerror_t openserial_printSniffedPacket(uint8_t* buffer, uint8_t length, uint8_t openserial_vars.outputBufFilled = TRUE; outputHdlcOpen(); outputHdlcWrite(SERFRAME_MOTE2PC_SNIFFED_PACKET); - outputHdlcWrite(idmanager_getMyID(ADDR_16B)->addr_16b[1]); outputHdlcWrite(idmanager_getMyID(ADDR_16B)->addr_16b[0]); + outputHdlcWrite(idmanager_getMyID(ADDR_16B)->addr_16b[1]); for (i=0;i<length;i++){ outputHdlcWrite(buffer[i]); } @@ -292,17 +292,13 @@ owerror_t openserial_printf(uint8_t calling_component, char* buffer, uint8_t len openserial_vars.outputBufFilled = TRUE; outputHdlcOpen(); outputHdlcWrite(SERFRAME_MOTE2PC_PRINTF); - outputHdlcWrite(idmanager_getMyID(ADDR_16B)->addr_16b[1]); outputHdlcWrite(idmanager_getMyID(ADDR_16B)->addr_16b[0]); + outputHdlcWrite(idmanager_getMyID(ADDR_16B)->addr_16b[1]); outputHdlcWrite(calling_component); - outputHdlcWrite(asn[0]); - outputHdlcWrite(asn[1]); - outputHdlcWrite(asn[2]); - outputHdlcWrite(asn[3]); - outputHdlcWrite(asn[4]); - for (i=0;i<length;i++){ + for(i=0; i<5;i++) + outputHdlcWrite(asn[i]); + for (i=0;i<length;i++) outputHdlcWrite(buffer[i]); - } outputHdlcClose(); ENABLE_INTERRUPTS();
Normalize path in 'getfileinfo' for local host.
if info.what == "C" then return "C function" else - return string.format("%s(%d)", info.short_src, info.currentline) + local sep = iif(os.ishost('windows'), '\\', '/') + return string.format("%s(%d)", path.translate(info.short_src, sep), info.currentline) end end
lovr.graphics.newShader accepts Blobs;
@@ -1031,15 +1031,21 @@ int l_lovrGraphicsNewModel(lua_State* L) { } int l_lovrGraphicsNewShader(lua_State* L) { - for (int i = 0; i < 2; i++) { - if (lua_isnoneornil(L, i + 1)) continue; - const char* source = luaL_checkstring(L, i + 1); + for (int i = 1; i <= 2; i++) { + if (lua_isnoneornil(L, i)) continue; + Blob** blob = luax_totype(L, i, Blob); + if (blob) { + lua_pushlstring(L, (*blob)->data, (*blob)->size); + lua_replace(L, i); + continue; + } + const char* source = luaL_checkstring(L, i); if (!lovrFilesystemIsFile(source)) continue; size_t bytesRead; char* contents = lovrFilesystemRead(source, &bytesRead); lovrAssert(bytesRead > 0, "Could not read shader from file '%s'", source); lua_pushlstring(L, contents, bytesRead); - lua_replace(L, i + 1); + lua_replace(L, i); free(contents); }
OcAppleBootPolicyLib: Initial fix to multiple os
@@ -924,6 +924,7 @@ BootPolicyGetBootFileEx ( ) { EFI_STATUS Status; + EFI_STATUS TmpStatus; EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *FileSystem; EFI_FILE_PROTOCOL *Root; @@ -953,10 +954,14 @@ BootPolicyGetBootFileEx ( if (!EFI_ERROR (Status)) { Status = EFI_NOT_FOUND; if ((VolumeInfo->Role & APPLE_APFS_VOLUME_ROLE_PREBOOT) != 0) { - Status = InternalGetBooterFromBlessedSystemFilePath (Root, FilePath); - if (EFI_ERROR (Status)) { - Status = InternalGetBooterFromBlessedSystemFolderPath (Device, Root, FilePath); - if (EFI_ERROR (Status)) { + TmpStatus = InternalGetBooterFromBlessedSystemFilePath (Root, FilePath); + if (EFI_ERROR (TmpStatus)) { + TmpStatus = InternalGetBooterFromBlessedSystemFolderPath (Device, Root, FilePath); + } + + // + // Blessed entry is always first, and subsequent entries are added with deduplication. + // Status = InternalGetBooterFromApfsPredefinedNameList ( Device, Root, @@ -965,7 +970,8 @@ BootPolicyGetBootFileEx ( FilePath, NULL ); - } + if (!EFI_ERROR (TmpStatus)) { + Status = TmpStatus; } }
dwarf: error in unmap size arguments This patch fixes an error in the unmapping of hash table memory when the dwarf hash table is resized.
@@ -524,9 +524,11 @@ dwarf_flush_rs_cache (struct dwarf_rs_cache *cache) cache->log_size = DWARF_DEFAULT_LOG_UNW_CACHE_SIZE; } else { if (cache->hash && cache->hash != cache->default_hash) - munmap(cache->hash, DWARF_UNW_HASH_SIZE(cache->prev_log_size)); + munmap(cache->hash, DWARF_UNW_HASH_SIZE(cache->prev_log_size) + * sizeof (cache->hash[0])); if (cache->buckets && cache->buckets != cache->default_buckets) - munmap(cache->buckets, DWARF_UNW_CACHE_SIZE(cache->prev_log_size)); + munmap(cache->buckets, DWARF_UNW_CACHE_SIZE(cache->prev_log_size) + * sizeof (cache->buckets[0])); GET_MEMORY(cache->hash, DWARF_UNW_HASH_SIZE(cache->log_size) * sizeof (cache->hash[0])); GET_MEMORY(cache->buckets, DWARF_UNW_CACHE_SIZE(cache->log_size)
Cavium OcteonTX: cache line fix According to Nitin Saxena ThunderX2 machine has 64B cache line whilst all others are 128B. According to Damjan, Nitin's previous patch broke compilation for all non-Cavium machines. This patch should make everything happy again.
@@ -32,11 +32,15 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)") endforeach() # Implementer 0x43 - Cavium # Part 0x0af - ThunderX2 is 64B, rest all are 128B - if (${CPU_IMPLEMENTER} STREQUAL "0x43" AND ${CPU_PART} STREQUAL "0x0af") + if (${CPU_IMPLEMENTER} STREQUAL "0x43") + if (${CPU_PART} STREQUAL "0x0af") set(VPP_LOG2_CACHE_LINE_SIZE 6) else() set(VPP_LOG2_CACHE_LINE_SIZE 7) endif() + else() + set(VPP_LOG2_CACHE_LINE_SIZE 6) + endif() math(EXPR VPP_CACHE_LINE_SIZE "1 << ${VPP_LOG2_CACHE_LINE_SIZE}") message(STATUS "ARM AArch64 CPU implementer ${CPU_IMPLEMENTER} part ${CPU_PART} cacheline size ${VPP_CACHE_LINE_SIZE}") else()
[Kernel] Neuture kernel-mode annotated prints These cause crashes on real hardware
@@ -316,6 +316,7 @@ int printk(const char* format, ...) { } static int print_annotated_common(print_destination dest, const char* prefix, const char* suffix, const char* format, va_list va) { + return 0; int total_len = 0; total_len += print_common(dest, prefix, NULL); @@ -327,6 +328,7 @@ static int print_annotated_common(print_destination dest, const char* prefix, co // TODO(PT): Drop printf() or printk() as the variants now do the same thing int printf_dbg(const char* format, ...) { + return 0; va_list va; va_start(va, format); int ret = print_annotated_common(PRINT_DESTINATION_SERIAL, "[debug ", "]\n", format, va); @@ -335,6 +337,7 @@ int printf_dbg(const char* format, ...) { } int printk_dbg(const char* format, ...) { + return 0; va_list va; va_start(va, format); int ret = print_annotated_common(PRINT_DESTINATION_SERIAL, "[debug ", "]\n", format, va); @@ -343,6 +346,7 @@ int printk_dbg(const char* format, ...) { } int printf_info(const char* format, ...) { + return 0; va_list va; va_start(va, format); int ret = print_annotated_common(PRINT_DESTINATION_SERIAL, "[info ", "]\n", format, va); @@ -351,6 +355,7 @@ int printf_info(const char* format, ...) { } int printk_info(const char* format, ...) { + return 0; va_list va; va_start(va, format); int ret = print_annotated_common(PRINT_DESTINATION_SERIAL, "[info ", "]\n", format, va); @@ -359,6 +364,7 @@ int printk_info(const char* format, ...) { } int printf_err(const char* format, ...) { + return 0; va_list va; va_start(va, format); int ret = print_annotated_common(PRINT_DESTINATION_SERIAL, "[error ", "]\n", format, va); @@ -367,6 +373,7 @@ int printf_err(const char* format, ...) { } int printk_err(const char* format, ...) { + return 0; va_list va; va_start(va, format); int ret = print_annotated_common(PRINT_DESTINATION_SERIAL, "[error ", "]\n", format, va);
CCode: Simplify code
@@ -75,18 +75,15 @@ int elektraCcodeOpen (Plugin * handle, Key * key ELEKTRA_UNUSED) d->decode['\''] = '\''; d->decode['"'] = '\"'; d->decode['0'] = '\0'; + + return 0; } - else - { + Key * cur = 0; while ((cur = ksNext (config)) != 0) { - /* ignore all keys not direct below */ - if (keyRel (root, cur) == 1) - { - /* ignore invalid size */ - if (keyGetBaseNameSize (cur) != 3) continue; - if (keyGetValueSize (cur) != 3) continue; + /* Ignore keys that are not directly below the config root key or have an incorrect size */ + if (keyRel (root, cur) != 1 || keyGetBaseNameSize (cur) != 3 || keyGetValueSize (cur) != 3) continue; int res; res = elektraHexcodeConvFromHex (keyBaseName (cur)[1]); @@ -100,8 +97,6 @@ int elektraCcodeOpen (Plugin * handle, Key * key ELEKTRA_UNUSED) d->encode[res & 255] = val; d->decode[val & 255] = res; } - } - } return 0; }
Add doxygen for ttrace APIs
@@ -109,10 +109,53 @@ struct trace_packet { // total 44 byte(message), 12byte(uid) #if defined(__cplusplus) extern "C" { #endif + +/** + * @ingroup TTRACE_LIBC + * @brief writes a trace log with string to indicate that a event has begun + * @param[in] number for tag + * @param[in] unique strings like function name for distinguishing events + * @return On success, TTRACE_VALID is returned. On failure, ERROR is returned and errno is set appropriately. + * @since Tizen RT vX.X + */ int trace_begin(int tag, char *str, ...); + +/** + * @ingroup TTRACE_LIBC + * @brief writes a trace log with unique id to indicate that a event has begun + * @param[in] number for tag + * @param[in] unique id for distinguishing events + * @return On success, TTRACE_VALID is returned. On failure, TTRACE_INVALID is returned and errno is set appropriately. + * @since Tizen RT vX.X + */ int trace_begin_u(int tag, int8_t uid); + +/** + * @ingroup TTRACE_LIBC + * @brief writes a trace log to indicate that the event has ended + * @param[in] number for tag + * @return On success, TTRACE_VALID is returned. On failure, TTRACE_INVALID is returned and errno is set appropriately. + * @since Tizen RT vX.X + */ int trace_end(int tag); + +/** + * @ingroup TTRACE_LIBC + * @brief writes a trace log to indicate that a event has ended + * @param[in] number for tag + * @return On success, TTRACE_VALID is returned. On failure, TTRACE_INVALID is returned and errno is set appropriately. + * @since Tizen RT vX.X + */ int trace_end_u(int tag); + +/** + * @ingroup TTRACE_LIBC + * @brief writes a trace log for scheduler events + * @param[in] tcb of current task + * @param[in] tcb of next task which will be switched + * @return On success, TTRACE_VALID is returned. On failure, TTRACE_INVALID is returned and errno is set appropriately. + * @since Tizen RT vX.X + */ int trace_sched(struct tcb_s *prev, struct tcb_s *next); #else #define trace_begin(a, b, ...)
MEMFS: no need to use binary mode for output
@@ -69,7 +69,7 @@ for directory in dirs: fcount += 1 opath = get_outfile_name(output_file_base, fcount) print("MEMFS: Generating output:", opath) - buffer = open(opath, 'wb') + buffer = open(opath, "w") full = "%s/%s" % (dirpath, name) _, ext = os.path.splitext(full) @@ -89,7 +89,7 @@ for directory in dirs: SIZES[name] = os.path.getsize(full) txt = "const unsigned char %s[] = {" % (name,) - buffer.write(txt.encode()) + buffer.write(txt) with open(full, "rb") as f: i = 0 @@ -104,12 +104,12 @@ for directory in dirs: for n in range(0, len(contents_hex), 2): twoChars = ascii(contents_hex[n : n + 2]) txt = "0x%s," % (twoChars,) - buffer.write(txt.encode()) + buffer.write(txt) i += 1 if (i % 20) == 0: - buffer.write("\n".encode()) + buffer.write("\n") - buffer.write("};\n".encode()) + buffer.write("};\n") if buffer.tell() >= CHUNK: buffer.close() buffer = None
[numerics] Set MIN_RELATIVE_SCALING to sqrt(DBL_EPSILON).
/* #define DEBUG_MESSAGES */ #include "siconos_debug.h" -#define MIN_RELATIVE_SCALING 1e300 +#define MIN_RELATIVE_SCALING sqrt(DBL_EPSILON) int gfc3d_compute_error(GlobalFrictionContactProblem* problem, double* reaction, double* velocity, @@ -296,6 +296,7 @@ int gfc3d_compute_error_convex(GlobalFrictionContactProblem* problem, DEBUG_PRINTF("relative error = %e\n", *error); numerics_printf_verbose(1,"---- GFC3D - Compute Error Convex case"); if(*error > tolerance) + { DEBUG_END("gfc3d_compute_error_convex(...)\n"); return 1;
New attack collision command accepts legacy burn, freeze, shock, and steal types. Only changes the type applied - not behavior.
@@ -11061,7 +11061,29 @@ s_model *load_cached_model(char *name, char *owner, char unload) attack.steal = GET_INT_ARG(1); break; case CMD_MODEL_COLLISION_DAMAGE_TYPE: - attack.attack_type = GET_INT_ARG(1); + + value = GET_ARG(1); + + if (stricmp(value, "burn") == 0) + { + attack.attack_type = ATK_BURN; + } + else if(stricmp(value, "freeze") == 0) + { + attack.attack_type = ATK_FREEZE; + } + else if (stricmp(value, "shock") == 0) + { + attack.attack_type = ATK_SHOCK; + } + else if (stricmp(value, "steal") == 0) + { + attack.attack_type = ATK_STEAL; + } + else + { + attack.attack_type = (int)value; + } break; case CMD_MODEL_COLLISION_DAMAGE_RECURSIVE_FORCE: recursive.force = GET_INT_ARG(1);
VERSION bump to version 2.2.19
@@ -65,7 +65,7 @@ endif() # micro version is changed with a set of small changes or bugfixes anywhere in the project. set(SYSREPO_MAJOR_VERSION 2) set(SYSREPO_MINOR_VERSION 2) -set(SYSREPO_MICRO_VERSION 18) +set(SYSREPO_MICRO_VERSION 19) set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_MICRO_VERSION}) # Version of the library
Avoid clipboard synchronization loop The Android device listens for clipboard changes to synchronize with the computer clipboard. However, if the change comes from scrcpy (for example via Ctrl+Shift+v), do not notify the change.
@@ -13,6 +13,8 @@ import android.os.IBinder; import android.view.IRotationWatcher; import android.view.InputEvent; +import java.util.concurrent.atomic.AtomicBoolean; + public final class Device { public static final int POWER_MODE_OFF = SurfaceControl.POWER_MODE_OFF; @@ -31,6 +33,7 @@ public final class Device { private ScreenInfo screenInfo; private RotationListener rotationListener; private ClipboardListener clipboardListener; + private final AtomicBoolean isSettingClipboard = new AtomicBoolean(); /** * Logical display identifier @@ -76,6 +79,10 @@ public final class Device { serviceManager.getClipboardManager().addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() { @Override public void dispatchPrimaryClipChanged() { + if (isSettingClipboard.get()) { + // This is a notification for the change we are currently applying, ignore it + return; + } synchronized (Device.this) { if (clipboardListener != null) { String text = getClipboardText(); @@ -181,7 +188,10 @@ public final class Device { } public boolean setClipboardText(String text) { - return serviceManager.getClipboardManager().setText(text); + isSettingClipboard.set(true); + boolean ok = serviceManager.getClipboardManager().setText(text); + isSettingClipboard.set(false); + return ok; } /**
fixed dipdap boards entries to test info Affected: lpc11u35_dipdap_sdt52832b_if lpc11u35_dipdap_sdt32429b_if lpc11u35_dipdap_sdt32439b_if lpc11u35_dipdap_std64b_if lpc11u35_dipdap_sdt51822b_if
@@ -95,9 +95,11 @@ PROJECT_RELEASE_INFO = { ('lpc11u35_mtb_wise1570_if', False, 0x0000, "bin" ), ('lpc11u35_mtb_laird_bl652_if', False, 0x0000, "bin" ), ('lpc11u35_mtb_usi_wm_bn_bm_22_if', False, 0x0000, "bin" ), - ('lpc11u35_dipdap_nrf52832_if', False, 0x0000, "bin" ), - ('lpc11u35_dipdap_stm32f429zi_if', False, 0x0000, "bin" ), - ('lpc11u35_dipdap_stm32f439zi_if', False, 0x0000, "bin" ), + ('lpc11u35_dipdap_sdt52832b_if', False, 0x0000, "bin" ), + ('lpc11u35_dipdap_sdt32429b_if', False, 0x0000, "bin" ), + ('lpc11u35_dipdap_sdt32439b_if', False, 0x0000, "bin" ), + ('lpc11u35_dipdap_std64b_if', False, 0x0000, "bin" ), + ('lpc11u35_dipdap_sdt51822b_if', False, 0x0000, "bin" ), } # All supported configurations @@ -185,9 +187,11 @@ SUPPORTED_CONFIGURATIONS = [ ( 0x1237, 'sam3u2c_ublox_evk_nina_b1_if', 'sam3u2c_bl', 'U-BLOX-EVK-NINA-B1' ), ( 0xC006, 'lpc11u35_vbluno51_if', None, 'VBLUNO51' ), ( 0xC005, 'lpc11u35_mtconnect04s_if', None, 'MtConnect04S' ), - ( 0xFFFF, 'lpc11u35_dipdap_nrf52832_if', None, None ), - ( 0xFFFF, 'lpc11u35_dipdap_stm32f429zi_if', None, None ), - ( 0xFFFF, 'lpc11u35_dipdap_stm32f439zi_if', None, None ), + ( 0x3104, 'lpc11u35_dipdap_sdt52832b_if', None, None ), + ( 0x3108, 'lpc11u35_dipdap_sdt32429b_if', None, None ), + ( 0x3110, 'lpc11u35_dipdap_sdt32439b_if', None, None ), + ( 0x3105, 'lpc11u35_dipdap_std64b_if', None, None ), + ( 0x3103, 'lpc11u35_dipdap_sdt51822b_if', None, None ), ] # Add new HICs here
network/netmgr: fix svace issue 637315 fix svace issue 637315
@@ -91,6 +91,7 @@ int netdev_req_handle(const char *msg, size_t msg_len) switch (dev->type) { case NM_WIFI: *res = netdev_handle_wifi(dev, lmsg->req_type, lmsg->data, lmsg->data_len); + break; case NM_ETHERNET: *res = netdev_handle_ethernet(dev, lmsg->req_type, lmsg->data, lmsg->data_len); break;
docs: update helper functions of BPF_PROG_TYPE_SOCKET_FILTER
@@ -292,7 +292,7 @@ The list of program types and supported helper functions can be retrieved with: |Program Type| Helper Functions| |------------|-----------------| -|`BPF_PROG_TYPE_SOCKET_FILTER`|`BPF_FUNC_get_current_uid_gid()` <br> `Base functions`| +|`BPF_PROG_TYPE_SOCKET_FILTER`|`BPF_FUNC_skb_load_bytes()` <br> `BPF_FUNC_skb_load_bytes_relative()` <br> `BPF_FUNC_get_socket_cookie()` <br> `BPF_FUNC_get_socket_uid()` <br> `BPF_FUNC_perf_event_output()` <br> `Base functions`| |`BPF_PROG_TYPE_KPROBE`|`BPF_FUNC_perf_event_output()` <br> `BPF_FUNC_get_stackid()` <br> `BPF_FUNC_get_stack()` <br> `BPF_FUNC_perf_event_read_value()` <br> `BPF_FUNC_override_return()` <br> `Tracing functions`| |`BPF_PROG_TYPE_SCHED_CLS` <br> `BPF_PROG_TYPE_SCHED_ACT`|`BPF_FUNC_skb_store_bytes()` <br> `BPF_FUNC_skb_load_bytes()` <br> `BPF_FUNC_skb_load_bytes_relative()` <br> `BPF_FUNC_skb_pull_data()` <br> `BPF_FUNC_csum_diff()` <br> `BPF_FUNC_csum_update()` <br> `BPF_FUNC_l3_csum_replace()` <br> `BPF_FUNC_l4_csum_replace()` <br> `BPF_FUNC_clone_redirect()` <br> `BPF_FUNC_get_cgroup_classid()` <br> `BPF_FUNC_skb_vlan_push()` <br> `BPF_FUNC_skb_vlan_pop()` <br> `BPF_FUNC_skb_change_proto()` <br> `BPF_FUNC_skb_change_type()` <br> `BPF_FUNC_skb_adjust_room()` <br> `BPF_FUNC_skb_change_tail()` <br> `BPF_FUNC_skb_get_tunnel_key()` <br> `BPF_FUNC_skb_set_tunnel_key()` <br> `BPF_FUNC_skb_get_tunnel_opt()` <br> `BPF_FUNC_skb_set_tunnel_opt()` <br> `BPF_FUNC_redirect()` <br> `BPF_FUNC_get_route_realm()` <br> `BPF_FUNC_get_hash_recalc()` <br> `BPF_FUNC_set_hash_invalid()` <br> `BPF_FUNC_set_hash()` <br> `BPF_FUNC_perf_event_output()` <br> `BPF_FUNC_get_smp_processor_id()` <br> `BPF_FUNC_skb_under_cgroup()` <br> `BPF_FUNC_get_socket_cookie()` <br> `BPF_FUNC_get_socket_uid()` <br> `BPF_FUNC_fib_lookup()` <br> `BPF_FUNC_skb_get_xfrm_state()` <br> `BPF_FUNC_skb_cgroup_id()` <br> `Base functions`| |`BPF_PROG_TYPE_TRACEPOINT`|`BPF_FUNC_perf_event_output()` <br> `BPF_FUNC_get_stackid()` <br> `BPF_FUNC_get_stack()` <br> `Tracing functions`|
{AH} add htslib conda dependencies explicitely to install section
@@ -26,7 +26,7 @@ bash Miniconda3.sh -b # Create a new conda environment with the target python version ~/miniconda3/bin/conda install conda-build -y -~/miniconda3/bin/conda create -q -y --name testenv python=$CONDA_PY cython numpy pytest psutil pip xz curl bzip2 +~/miniconda3/bin/conda create -q -y --name testenv python=$CONDA_PY cython numpy pytest psutil pip # activate testenv environment source ~/miniconda3/bin/activate testenv @@ -37,7 +37,8 @@ conda config --add channels conda-forge conda config --add channels bioconda # pin versions, so that tests do not fail when pysam/htslib out of step -conda install -y "samtools=1.5" "bcftools=1.5" "htslib=1.5" +# add htslib dependencies +conda install -y "samtools=1.5" "bcftools=1.5" "htslib=1.5" xz curl bzip2 # Need to make C compiler and linker use the anaconda includes and libraries: export PREFIX=~/miniconda3/
[fal] PKG_USING_FAL -> RT_USING_FAL
#ifdef BSP_USING_ON_CHIP_FLASH #include "drv_flash.h" -#if defined(PKG_USING_FAL) +#if defined(RT_USING_FAL) #include "fal.h" #endif @@ -171,7 +171,7 @@ __exit: return size; } -#if defined(PKG_USING_FAL) +#if defined(RT_USING_FAL) static int fal_flash_read(long offset, rt_uint8_t *buf, rt_uint32_t size); static int fal_flash_write(long offset, const rt_uint8_t *buf, rt_uint32_t size);
khan: fix pointer reference Using offsetof is very gross and probably suggests something is wrong somewhere. Maybe we should store the server configuration on a separate object from the khan configuration? But in the case of khan there isn't really a concept of multiple servers... N.B. We still have memory corruption.
@@ -95,11 +95,11 @@ _khan_read_cb(uv_stream_t* cli_u, ssize_t red_i, const uv_buf_t* buf_u) static void _khan_conn_cb(uv_stream_t* sem_u, c3_i tas_i) { - u3_khan* cop_u = (u3_khan*)sem_u; + u3_khan* cop_u = (u3_khan*)(sem_u - offsetof(u3_khan, pyp_u)); u3_chan* can_u; c3_i err_i; - can_u = c3_malloc(sizeof(u3_chan)); + can_u = c3_calloc(sizeof(u3_chan)); can_u->coq_l = ( cop_u->can_u ) ? 1 + cop_u->can_u->coq_l : 0; can_u->cop_u = cop_u; can_u->nex_u = cop_u->can_u; @@ -197,7 +197,6 @@ _khan_err_chdir: if ( 0 != chdir(pax_c) ) { u3l_log("khan: chdir: %s\n", uv_strerror(errno)); } - u3_king_bail(); } } @@ -283,6 +282,7 @@ u3_khan_io_init(u3_pier* pir_u) u3_auto* car_u = &cop_u->car_u; car_u->nam_m = c3__khan; + car_u->liv_o = c3n; car_u->io.talk_f = _khan_io_talk; car_u->io.kick_f = _khan_io_kick; car_u->io.exit_f = _khan_io_exit; @@ -297,5 +297,6 @@ u3_khan_io_init(u3_pier* pir_u) u3z(now); } + return car_u; }
Add missing fclose state
@@ -1746,6 +1746,7 @@ static void libc_stdio_freopen_tc(void) /* A case with NULL filename, valid stream and mode flag */ fp = freopen(NULL, "r", fp); + fclose(fp); TC_ASSERT_NEQ("freopen", fp, NULL); /* A negative case with NULL path, valid stream and invalid mode. It will return NULL */
core: list: removed flawed condition in mk_list_entry_is_orphan
@@ -175,8 +175,7 @@ static inline void mk_list_entry_init(struct mk_list *list) static inline int mk_list_entry_is_orphan(struct mk_list *head) { if (head->next != NULL && - head->prev != NULL && - head->next != head->prev) { + head->prev != NULL) { return MK_FALSE; }
Darn it, missed another mis-spell of rxml (was rexml).
@@ -27,7 +27,7 @@ VALUE rxml_wrap_schema_element(xmlSchemaElementPtr xelem) return class; } -static VALUE rexml_schema_element_node(VALUE self) +static VALUE rxml_schema_element_node(VALUE self) { xmlSchemaElementPtr xelem; @@ -36,7 +36,7 @@ static VALUE rexml_schema_element_node(VALUE self) return rxml_node_wrap(xelem->node); } -static VALUE rexml_schema_element_annot(VALUE self) +static VALUE rxml_schema_element_annot(VALUE self) { xmlSchemaElementPtr xelem; VALUE annotation = Qnil; @@ -64,6 +64,6 @@ void rxml_init_schema_element(void) rb_define_attr(cXMLSchemaElement, "namespace", 1, 0); rb_define_attr(cXMLSchemaElement, "type", 1, 0); - rb_define_method(cXMLSchemaElement, "node", rexml_schema_element_node, 0); - rb_define_method(cXMLSchemaElement, "annotation", rexml_schema_element_annot, 0); + rb_define_method(cXMLSchemaElement, "node", rxml_schema_element_node, 0); + rb_define_method(cXMLSchemaElement, "annotation", rxml_schema_element_annot, 0); }
engine: on shutdown, stop stream processor before plugins
@@ -473,7 +473,6 @@ int flb_engine_start(struct flb_config *config) /* Signal that we have started */ flb_engine_started(config); - while (1) { mk_event_wait(evl); mk_event_foreach(event, evl) { @@ -536,6 +535,12 @@ int flb_engine_shutdown(struct flb_config *config) config->is_running = FLB_FALSE; flb_input_pause_all(config); +#ifdef FLB_HAVE_STREAM_PROCESSOR + if (config->stream_processor_ctx) { + flb_sp_destroy(config->stream_processor_ctx); + } +#endif + /* router */ flb_router_exit(config); @@ -549,11 +554,6 @@ int flb_engine_shutdown(struct flb_config *config) flb_input_exit_all(config); flb_output_exit(config); -#ifdef FLB_HAVE_STREAM_PROCESSOR - if (config->stream_processor_ctx) { - flb_sp_destroy(config->stream_processor_ctx); - } -#endif /* Destroy the storage context */ flb_storage_destroy(config);
Correct typo in LMS config check
#endif #if defined(MBEDTLS_LMS_C) && \ - ! ( defined(MBEDTLS_PSA_CRYPTO_C) && defined(PSA_WANT_ALG_SHA256) ) -#error "MBEDTLS_LMS_C requires MBEDTLS_PSA_CRYPTO_C and PSA_WANT_ALG_SHA256" + ! ( defined(MBEDTLS_PSA_CRYPTO_C) && defined(PSA_WANT_ALG_SHA_256) ) +#error "MBEDTLS_LMS_C requires MBEDTLS_PSA_CRYPTO_C and PSA_WANT_ALG_SHA_256" #endif #if defined(MBEDTLS_LMS_PRIVATE) && \
add nfs v3 support to nfsdist.py add nfs v3 support to nfsdist.py
@@ -137,16 +137,21 @@ b = BPF(text=bpf_text) # common file functions b.attach_kprobe(event="nfs_file_read", fn_name="trace_entry") b.attach_kprobe(event="nfs_file_write", fn_name="trace_entry") -b.attach_kprobe(event="nfs4_file_open", fn_name="trace_entry") b.attach_kprobe(event="nfs_file_open", fn_name="trace_entry") b.attach_kprobe(event="nfs_getattr", fn_name="trace_entry") b.attach_kretprobe(event="nfs_file_read", fn_name="trace_read_return") b.attach_kretprobe(event="nfs_file_write", fn_name="trace_write_return") -b.attach_kretprobe(event="nfs4_file_open", fn_name="trace_open_return") b.attach_kretprobe(event="nfs_file_open", fn_name="trace_open_return") b.attach_kretprobe(event="nfs_getattr", fn_name="trace_getattr_return") +if BPF.get_kprobe_functions(b'nfs4_file_open'): + b.attach_kprobe(event="nfs4_file_open", fn_name="trace_entry") + b.attach_kretprobe(event="nfs4_file_open", fn_name="trace_open_return") +else: + b.attach_kprobe(event="nfs_file_open", fn_name="trace_entry") + b.attach_kretprobe(event="nfs_file_open", fn_name="trace_open_return") + print("Tracing NFS operation latency... Hit Ctrl-C to end.") # output
Update header guards IEEE802154.h
-#ifndef __IEEE802154_H -#define __IEEE802154_H +#ifndef OPENWSN_IEEE802154_H +#define OPENWSN_IEEE802154_H /** \addtogroup MAClow @@ -162,4 +162,4 @@ void ieee802154_retrieveHeader (OpenQueueEntry_t* msg, \} */ -#endif +#endif /* OPENWSN_IEEE802154_H */
Use printer serial number, if available.
@@ -168,12 +168,17 @@ _papplPrinterRegisterDNSSDNoLock( // Rename the service as needed... if (printer->dns_sd_collision) { - char new_dns_sd_name[256]; /* New DNS-SD name */ + char new_dns_sd_name[256]; // New DNS-SD name + const char *serial = strstr(printer->device_uri, "?serial="); + // Serial number const char *uuid = ippGetString(printer_uuid, 0, NULL); - /* "printer-uuid" value */ + // "printer-uuid" value pthread_rwlock_wrlock(&printer->rwlock); + if (serial) + snprintf(new_dns_sd_name, sizeof(new_dns_sd_name), "%s (%s)", printer->dns_sd_name, serial + 8); + else snprintf(new_dns_sd_name, sizeof(new_dns_sd_name), "%s (%c%c%c%c%c%c)", printer->dns_sd_name, toupper(uuid[39]), toupper(uuid[40]), toupper(uuid[41]), toupper(uuid[42]), toupper(uuid[43]), toupper(uuid[44])); free(printer->dns_sd_name);
new sedem tool Note: mandatory check (NEED_CHECK) was skipped
}, "sedem": { "formula": { - "sandbox_id": 492221962, + "sandbox_id": 492340123, "match": "SEDEM archive" },
Add documentation for rename workspace
@@ -223,6 +223,9 @@ set|plus|minus <amount> *reload* Reloads the sway config file and applies any changes. +*rename workspace* [<old_name>] to <new_name> + Rename either <old_name> or the focused workspace to the <new_name> + *resize* shrink|grow width|height [<amount> [px|ppt]] Resizes the currently focused container by _amount_, specified in pixels or percentage points. If the units are omitted, floating containers are resized
OcBootManagementLib: Fix the use of uninitialised value
@@ -82,6 +82,7 @@ ExpandShortFormBootPath ( // volume. // PrevDevicePath = NULL; + IsDirectory = FALSE; do { FullDevicePath = OcGetNextLoadOptionDevicePath ( DevicePath,
add bsp/ls2k window compilation instructions
@@ -9,7 +9,7 @@ from building import * TARGET = 'rtthread.' + rtconfig.TARGET_EXT -rtconfig.AFLAGS += ' -I' + str(Dir('#')) +rtconfig.AFLAGS += ' -I' + str(Dir('#')) + ' -I ' + RTT_ROOT + '/libcpu/mips/common/' DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'],
Add attack type member.
@@ -1656,6 +1656,7 @@ typedef struct s_damage_recursive int rate; // Tick delay. unsigned int tick; // Time of next tick. unsigned int time; // Time to expire. + int type; // Attack type. struct entity *owner; // Entity that caused the recursive damage. struct s_damage_recursive *next; // Next node of linked list. } s_damage_recursive;
[NFSU] framelimit bugfix
@@ -1028,7 +1028,15 @@ void Init() injector::WriteMemory(dword_40A744, FrameTime, true); // something related to framerate and/or seconds. This value has to be an integer multiple of 60, otherwise the game can freeze. This affects some gameplay features such as NOS and menus. uint32_t* dword_6CC8B0 = *hook::pattern("83 E1 01 0B F9 D9 44 24 28 D8 1D ? ? ? ?").count(1).get(0).get<uint32_t*>(11); - static float FrameSeconds = nFPSLimit - (nFPSLimit % 60); + static float FrameSeconds = nFPSLimit; + + if (nFPSLimit % 60) + FrameSeconds = nFPSLimit - (nFPSLimit % 60); + + // needed to avoid crashes, anything above 120 seems to be problematic at the moment... + if (FrameSeconds > 120.0f) + FrameSeconds = 120.0f; + if (FrameSeconds < 60.0) FrameSeconds = 60.0; injector::WriteMemory(dword_6CC8B0, FrameSeconds, true);
ci: tell AppVeyor to generate Windows installers With this patch, AppVeyor automatically generates Windows installers on each CI build. Something like below: td-agent-bit-1.1.0-win32.exe td-agent-bit-1.1.0-win64.exe These installers are downloadable from the "Artifacts" tab in the build detail page, and retained for 6 months.
@@ -7,8 +7,7 @@ platform: - x64 configuration: - - Debug - # - Release # TODO + - Release before_build: - cmd: if "%platform%"=="Win32" set msvc=Visual Studio 15 2017 @@ -16,3 +15,9 @@ before_build: build_script: - powershell ".\ci\do-ut.ps1;exit $LASTEXITCODE" + - cd build + - cpack -C "%configuration%" + +artifacts: + - path: build/td-agent-bit-*.exe + name: td-agent-bit
libcupsfilters: Add page log message in rastertops() filter function
@@ -60,6 +60,8 @@ writeStartPage(int page, /* I - Page to write */ int length, /* I - Page length in points */ rastertops_doc_t *doc) /* I - Document information */ { + if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL, + "PAGE: %d %d\n", page, 1); fprintf(doc->outputfp, "%%%%Page: %d %d\n", page, page); fprintf(doc->outputfp, "%%%%BeginPageSetup\n"); fprintf(doc->outputfp, "<< /PageSize[%d %d] >> setpagedevice\n", width, length);
BugID:2484327:fix gpio_map table declaration for stm32f429zi-necleo
@@ -44,12 +44,12 @@ uart_dev_t uart_0; const gpio_mapping_t gpio_mapping_table[TOTAL_GPIO_NUM] = { - {ON_BOARD_LED01, GPIOB, GPIO_PIN_0, /*IRQ_NULL,*/GPIO_SPEED_FREQ_LOW, GPIO_PULLUP}, - {ON_BOARD_LED02, GPIOB, GPIO_PIN_7, /*IRQ_NULL,*/GPIO_SPEED_FREQ_LOW, GPIO_PULLUP}, - {ON_BOARD_LED03, GPIOB, GPIO_PIN_14, /*IRQ_NULL,*/GPIO_SPEED_FREQ_LOW, GPIO_PULLUP}, - {HAL_GPIO_8, GPIOA, GPIO_PIN_8, /*IRQ_NULL,*/GPIO_SPEED_FREQ_LOW, GPIO_PULLUP}, - {HAL_GPIO_9, GPIOA, GPIO_PIN_9, /*IRQ_NULL,*/GPIO_SPEED_FREQ_LOW, GPIO_PULLUP}, - {ON_BOARD_TIM4_CH4, GPIOD, GPIO_PIN_15, /*IRQ_NULL,*/GPIO_SPEED_FREQ_LOW, GPIO_PULLUP} + {ON_BOARD_LED01, GPIO_MODE_OUTPUT_PP, GPIO_SPEED_FREQ_LOW, GPIO_PULLUP, 0}, + {ON_BOARD_LED02, GPIO_MODE_OUTPUT_PP, GPIO_SPEED_FREQ_LOW, GPIO_PULLUP, 0}, + {ON_BOARD_LED03, GPIO_MODE_OUTPUT_PP, GPIO_SPEED_FREQ_LOW, GPIO_PULLUP, 0}, + {HAL_GPIO_8, GPIO_MODE_OUTPUT_PP, GPIO_SPEED_FREQ_LOW, GPIO_PULLUP, 0}, + {HAL_GPIO_9, GPIO_MODE_OUTPUT_PP, GPIO_SPEED_FREQ_LOW, GPIO_PULLUP, 0}, + {ON_BOARD_TIM4_CH4, GPIO_MODE_AF_PP, GPIO_SPEED_FREQ_LOW, GPIO_PULLUP, 0} }; gpio_dev_t brd_gpio_table[] =
gfni: remove erroneous semicolons from a couple macro definitions
@@ -464,7 +464,7 @@ simde__m128i simde_mm_gf2p8mul_epi8 (simde__m128i a, simde__m128i b) { #endif } #if defined(SIMDE_X86_GFNI_NATIVE) && defined(SIMDE_X86_AVX512VL_NATIVE) - #define simde_mm_gf2p8mul_epi8(a, b) _mm_gf2p8mul_epi8(a, b); + #define simde_mm_gf2p8mul_epi8(a, b) _mm_gf2p8mul_epi8(a, b) #endif #if defined(SIMDE_X86_GFNI_ENABLE_NATIVE_ALIASES) #undef _mm_gf2p8mul_epi8 @@ -489,7 +489,7 @@ simde_mm256_gf2p8mul_epi8 (simde__m256i a, simde__m256i b) { return simde__m256i_from_private(r_); } #if defined(SIMDE_X86_GFNI_NATIVE) && defined(SIMDE_X86_AVX512VL_NATIVE) - #define simde_mm256_gf2p8mul_epi8(a, b) _mm256_gf2p8mul_epi8(a, b); + #define simde_mm256_gf2p8mul_epi8(a, b) _mm256_gf2p8mul_epi8(a, b) #endif #if defined(SIMDE_X86_GFNI_ENABLE_NATIVE_ALIASES) #undef _mm256_gf2p8mul_epi8
Update README.md for 2.0 release
@@ -25,17 +25,6 @@ This project is licensed under the Apache 2.0 license. By downloading any component from this repository you acknowledge that you accept terms specified in the [LICENSE.txt](LICENSE.txt) file. -# Branches - -The `master` branch is an active development branch for the next major release -of the compressor; version 2.x. It aims to be a stable branch, but as it is -still under development expect changes to both the command line and the -quality-performance trade offs the compressor is making. - -The `1.x` branch is a maintenance branch for the 1.x release series. It is -stable and we will now only land bug fixes for this branch; no new -functionality or performance improvements should be expected. - # Encoder feature support The encoder supports compression of low dynamic range (BMP, JPEG, PNG, TGA) and @@ -72,6 +61,8 @@ Release build binaries for the `astcenc` stable releases are provided in the [GitHub Releases page](https://github.com/ARM-software/astc-encoder/releases). Binaries are provided for 64-bit builds on Windows, macOS, and Linux. +The latest stable release is version 2.0. + ## astcenc 2.x binaries The current builds of the astcenc 2.x series are provided as multiple binaries, @@ -90,6 +81,14 @@ It is worth noting that the three binaries do not produce identical output images; there are minor output differences caused by variations in floating-point rounding. +## Repository branches + +The `master` branch is an active development branch for the compressor. It aims +to be a stable branch, but as it is used for development expect it to change. + +The `1.x` branch is a maintenance branch for the 1.x release series. It is +no longer under active development. + # Getting started Open a terminal, change to the appropriate directory for your system, and run
may use ==. typo.
@@ -584,7 +584,7 @@ int h2o_hpack_parse_response_headers(h2o_mem_pool_t *pool, int *status, h2o_head h2o_hpack_header_table_t *header_table, const uint8_t *src, size_t len, const char **err_desc) { assert(*status == 0); - assert(*content_length = SIZE_MAX); + assert(*content_length == SIZE_MAX); const uint8_t *src_end = src + len;
add sm_30 to default NVPTX gpus, also add gpus that are the default set in CMakeLists.txt for building nvptx deviceRTLS
@@ -80,8 +80,6 @@ AOMP_STANDALONE_BUILD=${AOMP_STANDALONE_BUILD:-1} if [ "$AOMP_PROC" == "ppc64le" ] ; then AOMP_BUILD_CUDA=1 AOMP_STANDALONE_BUILD=1 -else - AOMP_BUILD_CUDA=0 fi if [ $AOMP_STANDALONE_BUILD == 1 ] ; then # Default is to build nvptx for STANDALONE build @@ -118,7 +116,7 @@ fi # Set list of default nvptx subarchitectures to build # Only Cuda 9 and above supports sm_70 if [ "$AOMP_BUILD_CUDA" == 1 ] ; then - NVPTXGPUS_DEFAULT="30,32,35,50,60,61" + NVPTXGPUS_DEFAULT="30,35,37,50,52,53,60,61,62" if [ -f $CUDA/version.txt ] ; then if [ `head -1 $CUDA/version.txt | cut -d " " -f 3 | cut -d "." -f 1` -ge 9 ] ; then NVPTXGPUS_DEFAULT+=",70"
improve and add comments to matrix decompositions
@@ -328,6 +328,7 @@ glm_uniscaled(mat4 m) { /*! * @brief decompose rotation matrix (mat4) and scale vector [Sx, Sy, Sz] + * DON'T pass projected matrix here * * @param[in] m affine transform * @param[out] r rotation matrix @@ -352,18 +353,21 @@ glm_decompose_rs(mat4 m, mat4 r, vec3 s) { glm_vec4_scale(r[1], 1.0f/s[1], r[1]); glm_vec4_scale(r[2], 1.0f/s[2], r[2]); + /* Note from Apple Open Source (asume that the matrix is orthonormal): + check for a coordinate system flip. If the determinant + is -1, then negate the matrix and the scaling factors. */ glm_vec_cross(m[0], m[1], v); if (glm_vec_dot(v, m[2]) < 0.0f) { - glm_vec4_scale(r[0], -1.0f, r[0]); - glm_vec4_scale(r[1], -1.0f, r[1]); - glm_vec4_scale(r[2], -1.0f, r[2]); - - glm_vec_scale(s, -1.0f, s); + glm_vec4_flipsign(r[0]); + glm_vec4_flipsign(r[1]); + glm_vec4_flipsign(r[2]); + glm_vec_flipsign(s); } } /*! - * @brief decompose affine transform + * @brief decompose affine transform, TODO: extract shear factors. + * DON'T pass projected matrix here * * @param[in] m affine transfrom * @param[out] t translation vector
updated `qt.qrc` rule The rule should now be able to cache resources files version and rebuild resources if something changed.
@@ -57,6 +57,14 @@ rule("qt.qrc") batchcmds:vrunv(rcc, {"-name", path.basename(sourcefile_qrc), sourcefile_qrc, "-o", sourcefile_cpp}) batchcmds:compile(sourcefile_cpp, objectfile) + -- get qrc resources files + local outdata = os.iorunv(rcc, {"-name", path.basename(sourcefile_qrc), sourcefile_qrc, "-list"}) + + -- add resources files to batch + for file in outdata:gmatch("([^\n]*)\n?") do + batchcmds:add_depfiles(file) + end + -- add deps batchcmds:add_depfiles(sourcefile_qrc) batchcmds:set_depmtime(os.mtime(objectfile))
Use UINT64_MAX instead of defining case-specific sentinel
* up to how many RETIRE_CONNECTION_IDs to keep for retransmission */ #define QUICLY_RETIRE_CONNECTION_ID_LIMIT (QUICLY_LOCAL_ACTIVE_CONNECTION_ID_LIMIT * 2) -/** - * indicates there's nothing to send in this retire CID slot - * see quicly_conn_t::egress::retire_cid - */ -#define QUICLY_PENDING_RETIRE_CID_EMPTY UINT64_MAX KHASH_MAP_INIT_INT64(quicly_stream_t, quicly_stream_t *) @@ -370,7 +365,7 @@ struct st_quicly_conn_t { */ struct { /** - * sequence numbers to ask for retirement -- QUICLY_PENDING_RETIRE_CID_EMPTY indicates empty slot + * sequence numbers to ask for retirement -- UINT64_MAX indicates empty slot */ uint64_t sequences[QUICLY_RETIRE_CONNECTION_ID_LIMIT]; /** @@ -853,7 +848,7 @@ static int schedule_retire_connection_id(quicly_conn_t *conn, uint64_t sequence) } for (int i = 0; i < QUICLY_RETIRE_CONNECTION_ID_LIMIT; i++) { - if (conn->egress.retire_cid.sequences[i] != QUICLY_PENDING_RETIRE_CID_EMPTY) + if (conn->egress.retire_cid.sequences[i] != UINT64_MAX) continue; conn->egress.retire_cid.sequences[i] = sequence; @@ -1887,7 +1882,7 @@ static quicly_conn_t *create_connection(quicly_context_t *ctx, const char *serve quicly_cc_init(&conn->_.egress.cc); conn->_.egress.retire_cid.num_pending = 0; for (int i = 0; i < QUICLY_RETIRE_CONNECTION_ID_LIMIT; i++) - conn->_.egress.retire_cid.sequences[i] = QUICLY_PENDING_RETIRE_CID_EMPTY; + conn->_.egress.retire_cid.sequences[i] = UINT64_MAX; quicly_linklist_init(&conn->_.egress.pending_streams.blocked.uni); quicly_linklist_init(&conn->_.egress.pending_streams.blocked.bidi); quicly_linklist_init(&conn->_.egress.pending_streams.control); @@ -3849,7 +3844,7 @@ static int do_send(quicly_conn_t *conn, quicly_send_context_t *s) continue; /* empty slot */ if ((ret = send_retire_connection_id(conn, s, sequence)) != 0) goto Exit; - conn->egress.retire_cid.sequences[i] = QUICLY_PENDING_RETIRE_CID_EMPTY; + conn->egress.retire_cid.sequences[i] = UINT64_MAX; conn->egress.retire_cid.num_pending--; } }
Silence unused parameter warning in gumbo_debug() function When compiling without GUMBO_DEBUG defined.
@@ -82,5 +82,5 @@ void gumbo_debug(const char* format, ...) { fflush(stdout); } #else -void gumbo_debug(const char* format, ...) {} +void gumbo_debug(const char* UNUSED(format), ...) {} #endif
YAML CPP: Simplify code to determine array index
@@ -146,21 +146,18 @@ NameIterator relativeKeyIterator (Key const & key, Key const & parent) } /** - * @brief This function checks if a key name specifies an array key. - * - * If the key name contains a valid array index that is smaller than `unsigned long long`, then the function will also return this index. + * @brief This function returns the array index for a given key part. * * @param nameIterator This iterator specifies the name of the key. * - * @retval (true, arrayIndex) if `name` specifies an array key, where `arrayIndex` specifies the index stored in the array key. - * @retval (false, 0) otherwise + * @retval The index of the array element, or `0` if the given key part is not an array element. */ -std::pair<bool, unsigned long long> isArrayIndex (NameIterator const & nameIterator) +unsigned long long getArrayIndex (NameIterator const & nameIterator) { string const name = *nameIterator; auto const offsetIndex = ckdb::elektraArrayValidateBaseNameString (name.c_str ()); auto const isArrayElement = offsetIndex >= 1; - return { isArrayElement, isArrayElement ? stoull (name.substr (static_cast<size_t> (offsetIndex))) : 0 }; + return isArrayElement ? stoull (name.substr (static_cast<size_t> (offsetIndex))) : 0; } /** @@ -305,10 +302,9 @@ void addKeyNoArray (YAML::Node & data, NameIterator & keyIterator, Key & key) */ void addKeyArray (YAML::Node & data, NameIterator & keyIterator, Key & key, Key & converted, Key * arrayParent) { - auto const isArrayAndIndex = isArrayIndex (keyIterator); converted.addBaseName (*keyIterator); - auto const isArrayElement = isArrayAndIndex.first && arrayParent && converted.isDirectBelow (*arrayParent); - auto const arrayIndex = isArrayAndIndex.second; + auto const isArrayElement = arrayParent && converted.isDirectBelow (*arrayParent); + auto const arrayIndex = isArrayElement ? getArrayIndex (keyIterator) : 0; if (data.IsScalar ()) data = YAML::Node (YAML::NodeType::Undefined);
Add missing test for interface being up. Thanks to Dave Taht.
@@ -1172,6 +1172,9 @@ really_send_update(struct interface *ifp, const unsigned char *id, unsigned short seqno, unsigned short metric, unsigned char *channels, int channels_len) { + if(!if_up(ifp)) + return; + if((ifp->flags & IF_UNICAST) != 0) { struct neighbour *neigh; FOR_ALL_NEIGHBOURS(neigh) {
Micro framework it is...
-# facil.io - a mini-framework for C web applications +# facil.io - a micro-framework for C web applications [![GitHub](https://img.shields.io/badge/GitHub-Open%20Source-blue.svg)](https://github.com/boazsegev/facil.io) [![Build Status](https://travis-ci.org/boazsegev/facil.io.svg?branch=reHTTP)](https://travis-ci.org/boazsegev/facil.io) -[facil.io](http://facil.io) is a C mini-framework for web applications and includes: +[facil.io](http://facil.io) is a C micro-framework for web applications. facil.io includes: * A fast HTTP/1.1 and Websocket static file + application server. * Support for custom network protocols for both server and client connections. * Dynamic types designed with web applications in mind (Strings, Hashes, Arrays etc'). -* JSON parsing and formatting for easy network communication. +* Performant JSON parsing and formatting for easy network communication. * A pub/sub process cluster engine for local and Websocket pub/sub. * Optional connectivity with Redis. -[facil.io](http://facil.io) powers the [HTTP/Websockets Ruby Iodine server](https://github.com/boazsegev/iodine) and it can easily power your application as well. - [facil.io](http://facil.io) provides high performance TCP/IP network services to Linux / BSD (and macOS) by using an evented design (as well as thread pool and forking support) and provides an easy solution to [the C10K problem](http://www.kegel.com/c10k.html). You can read more about [facil.io](http://facil.io) on the [facil.io](http://facil.io) website. +### Running on `facil.io` + +* [Iodine, a Ruby HTTP/Websockets Ruby application server](https://github.com/boazsegev/iodine) is powered by `facil.io`. + +* Are you using `facil.io`? Let me know! + +### An HTTP example + ```c #include "http.h" /* the HTTP facil.io extension */
Replace field access with getter (u).
@@ -782,7 +782,7 @@ void ts_internal_bspline_eval(const tsBSpline *spline, tsReal u, i = fst + r; for (; i <= lst; i++) { ui = spline->pImpl->knots[i]; - a = (_deBoorNet_->pImpl->u - ui) / + a = (ts_deboornet_knot(_deBoorNet_) - ui) / (spline->pImpl->knots[i+deg-r+1] - ui); a_hat = 1.f-a; @@ -1120,7 +1120,7 @@ void ts_internal_bspline_insert_knot(const tsBSpline *spline, /* copy knots */ to = _result_->pImpl->knots+k+1; for (i = 0; i < n; i++) { /* d) */ - *to = deBoorNet->pImpl->u; + *to = ts_deboornet_knot(deBoorNet); to++; } }
synthetic: tweaks to the warmup routine
@@ -302,20 +302,22 @@ fn run_client( let mut last = 100_000_000; let mut send_schedule: Vec<u64> = Vec::with_capacity(packets); + let mut rng = rand::thread_rng(); /* Climb in 100ms increments */ for t in 1..(10 * ramp_up_seconds) { let rate = t * packets_per_second / (ramp_up_seconds * 10); let ns_per_packet = 1000_000_000 / rate; - for _ in 0..(rate / 10) { - last += ns_per_packet as u64; + let exp = Exp::new(1.0 / ns_per_packet as f64); + let end = last + duration_to_ns(Duration::from_millis(100)); + while last < end { + last += exp.ind_sample(&mut rng) as u64; send_schedule.push(last) } } let discard_thresh = Duration::from_nanos(last); - let mut rng = rand::thread_rng(); let ns_per_packet = 1000_000_000 / packets_per_second; let exp = Exp::new(1.0 / ns_per_packet as f64); let end = last + duration_to_ns(runtime); @@ -762,12 +764,23 @@ fn main() { "linux-client" | "runtime-client" => { backend.init_and_run(config, move || { println!("Distribution, Target, Actual, Dropped, Never Sent, Median, 90th, 99th, 99.9th, 99.99th, Start"); + match (proto, &barrier_group) { + (_, Some(lockstep::Group::Client(ref _c))) => (), + (Protocol::Memcached, _) => { + if !run_memcached_preload(backend, Transport::Tcp, addr, nthreads) { + panic!("Could not preload memcached"); + } + }, + _ => (), + }; + if dowarmup { - for packets_per_second in (1..3).map(|i| i * 100000) { + // Run at full pps 3 times for 20 seconds + for _ in 0..3 { run_client( backend, addr, - Duration::from_secs(1), + Duration::from_secs(20), packets_per_second, nthreads, OutputMode::Silent, @@ -778,21 +791,13 @@ fn main() { 0, rampup, ); + backend.sleep(Duration::from_secs(5)); } } - match (proto, &barrier_group) { - (_, Some(lockstep::Group::Client(ref _c))) => (), - (Protocol::Memcached, _) => { - if !run_memcached_preload(backend, Transport::Tcp, addr, nthreads) { - panic!("Could not preload memcached"); - } - }, - _ => (), - }; - let step_size = (packets_per_second - start_packets_per_second) / samples; for j in 1..=samples { + backend.sleep(Duration::from_secs(5)); run_client( backend, addr, @@ -807,7 +812,6 @@ fn main() { j, rampup, ); - backend.sleep(Duration::from_secs(3)); } if let Some(ref mut g) = barrier_group { g.barrier();
hkdf zeroization fix
@@ -281,6 +281,7 @@ static unsigned char *HKDF_Expand(const EVP_MD *evp_md, unsigned char *okm, size_t okm_len) { HMAC_CTX *hmac; + unsigned char *ret = NULL; unsigned int i; @@ -330,11 +331,10 @@ static unsigned char *HKDF_Expand(const EVP_MD *evp_md, done_len += copy_len; } - - HMAC_CTX_free(hmac); - return okm; + ret = okm; err: + OPENSSL_cleanse(prev, sizeof(prev)); HMAC_CTX_free(hmac); - return NULL; + return ret; }
Update 5.json with catalog changes (amgetmulti -> amgetbitmap) To update 5.json, we ran: cat src/include/catalog/*.h | perl src/backend/catalog/process_foreign_keys.pl > gpMgmt/bin/gppylib/data/5.json
{ "__comment" : "Generated by process_foreign_keys.pl", - "__info" : { "CATALOG_VERSION_NO" : "301705051" }, + "__info" : { "CATALOG_VERSION_NO" : "301709131" }, "gp_distribution_policy" : { "foreign_keys" : [ [ ["localoid"], "pg_class", ["oid"] ] [ ["aminsert"], "pg_proc", ["oid"] ], [ ["ambeginscan"], "pg_proc", ["oid"] ], [ ["amgettuple"], "pg_proc", ["oid"] ], - [ ["amgetmulti"], "pg_proc", ["oid"] ], + [ ["amgetbitmap"], "pg_proc", ["oid"] ], [ ["amrescan"], "pg_proc", ["oid"] ], [ ["amendscan"], "pg_proc", ["oid"] ], [ ["ammarkpos"], "pg_proc", ["oid"] ],
Log handshake_count
@@ -4833,8 +4833,8 @@ ssize_t ngtcp2_conn_on_loss_detection_alarm(ngtcp2_conn *conn, } ngtcp2_log_info(&conn->log, NGTCP2_LOG_EVENT_RCV, - "tlp_count=%zu rto_count=%zu", rcs->tlp_count, - rcs->rto_count); + "handshake_count=%zu tlp_count=%zu rto_count=%zu", + rcs->handshake_count, rcs->tlp_count, rcs->rto_count); ngtcp2_conn_set_loss_detection_alarm(conn);
Unset memory table entry, not just the temporary pointer to it on shutdown to fix crash with multiple instances of OpenBLAS,
@@ -1279,7 +1279,7 @@ void blas_shutdown(void){ struct alloc_t *alloc_info = local_memory_table[thread][pos]; if (alloc_info) { alloc_info->release_func(alloc_info); - alloc_info = (void *)0; + local_memory_table[thread][pos] = (void *)0; } } }
nshlib/nsh_console.h: Fix copy paste errors. Some Kconfig configuration names needed CONFIG_ prefix.
#if CONFIG_NFILE_STREAMS > 0 # ifdef CONFIG_NSH_ALTCONDEV -# if !defined(CONFIG_NSH_ALTSTDIN) && !defined(NSH_ALTSTDOUT) && \ - !defined(CONFIGNSH_ALTSTDERR) +# if !defined(CONFIG_NSH_ALTSTDIN) && !defined(CONFIG_NSH_ALTSTDOUT) && \ + !defined(CONFIG_NSH_ALTSTDERR) # error CONFIG_NSH_ALTCONDEV selected but CONFIG_NSH_ALTSTDxxx not provided # endif
Support NVIDIA HPC compiler
@@ -48,7 +48,7 @@ OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLA dot[0]=0.0; dot[1]=0.0; -#if !defined(__PPC__) && !defined(__SunOS) +#if !defined(__PPC__) && !defined(__SunOS) && !defined(__PGI) CREAL(result) = 0.0 ; CIMAG(result) = 0.0 ; #else @@ -73,7 +73,7 @@ OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLA i++ ; } -#if !defined(__PPC__) && !defined(__SunOS) +#if !defined(__PPC__) && !defined(__SunOS) && !defined(__PGI) CREAL(result) = dot[0]; CIMAG(result) = dot[1]; #else
kdb-complete: fix infinite loop with escaped key names
@@ -116,6 +116,8 @@ void CompleteCommand::completeNormal (const string argument, const Key parsedArg const int offset = distance (root.begin (), root.end ()) - rootExists + shallShowNextLevel (argument); const auto nameFilter = root.isCascading () ? filterCascading : filterName; + // Let elektra handle the escaping of the input for us + const string argumentEscaped = parsedArgument.getFullName (); const auto filter = [&](const pair<Key, pair<int, int>> & c) { return filterDepth (cl.minDepth + offset, max (cl.maxDepth, cl.maxDepth + offset), c) && nameFilter (argument, c); }; @@ -227,7 +229,9 @@ void CompleteCommand::printResults (const Key root, const int minDepth, const in const Key CompleteCommand::getParentKey (const Key key) { - return Key (key.getFullName ().erase (key.getFullName ().size () - key.getBaseName ().size ()), KEY_END); + Key parentKey = key.dup (); // We can't set baseName on keys in keysets, so duplicate it + ckdb::keySetBaseName (parentKey.getKey (), NULL); + return parentKey; } KeySet CompleteCommand::getKeys (Key root, const bool cutAtRoot) @@ -334,7 +338,6 @@ bool CompleteCommand::filterCascading (const string argument, const pair<Key, pa bool CompleteCommand::filterName (const string argument, const pair<Key, pair<int, int>> & current) { - // For a namespace completion, compare by substring const string test = current.first.getFullName (); return argument.size () <= test.size () && equal (argument.begin (), argument.end (), test.begin ()); }
board/dood/led.c: Format with clang-format BRANCH=none TEST=none
@@ -20,16 +20,23 @@ __override const int led_charge_lvl_2 = 100; /* Dood: Note there is only LED for charge / power */ __override struct led_descriptor led_bat_state_table[LED_NUM_STATES][LED_NUM_PHASES] = { - [STATE_CHARGING_LVL_2] = {{EC_LED_COLOR_AMBER, LED_INDEFINITE} }, - [STATE_CHARGING_FULL_CHARGE] = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} }, - [STATE_DISCHARGE_S0] = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} }, - [STATE_DISCHARGE_S3] = {{EC_LED_COLOR_AMBER, 1 * LED_ONE_SEC}, + [STATE_CHARGING_LVL_2] = { { EC_LED_COLOR_AMBER, + LED_INDEFINITE } }, + [STATE_CHARGING_FULL_CHARGE] = { { EC_LED_COLOR_WHITE, + LED_INDEFINITE } }, + [STATE_DISCHARGE_S0] = { { EC_LED_COLOR_WHITE, + LED_INDEFINITE } }, + [STATE_DISCHARGE_S3] = { { EC_LED_COLOR_AMBER, + 1 * LED_ONE_SEC }, { LED_OFF, 3 * LED_ONE_SEC } }, [STATE_DISCHARGE_S5] = { { LED_OFF, LED_INDEFINITE } }, - [STATE_BATTERY_ERROR] = {{EC_LED_COLOR_AMBER, 1 * LED_ONE_SEC}, + [STATE_BATTERY_ERROR] = { { EC_LED_COLOR_AMBER, + 1 * LED_ONE_SEC }, { LED_OFF, 1 * LED_ONE_SEC } }, - [STATE_FACTORY_TEST] = {{EC_LED_COLOR_WHITE, 2 * LED_ONE_SEC}, - {EC_LED_COLOR_AMBER, 2 * LED_ONE_SEC} }, + [STATE_FACTORY_TEST] = { { EC_LED_COLOR_WHITE, + 2 * LED_ONE_SEC }, + { EC_LED_COLOR_AMBER, + 2 * LED_ONE_SEC } }, }; const enum ec_led_id supported_led_ids[] = { EC_LED_ID_BATTERY_LED };
Remove short pyserial timeout. Timeout was causing console to disconnect during Piksi Multi restart. Timeout made serial driver not equivalent in behavior to file driver or network driver
@@ -46,7 +46,7 @@ class PySerialDriver(BaseDriver): try: handle = serial.serial_for_url(port) handle.baudrate = baud - handle.timeout = 1 + handle.timeout = None handle.rtscts = rtscts super(PySerialDriver, self).__init__(handle) except (OSError, serial.SerialException) as e:
Documentation: Fix Markdown list
@@ -6,8 +6,10 @@ There should be no scripts top-level but only in sub directories. These files are installed on the target system. -- [kdb](kdb): for scripts to be used with `kdb <script>`. -[ffconfig](ffconfig): to configure firefox. +- [kdb](kdb): for scripts to be used with `kdb <script>`. +- [ffconfig](ffconfig): to configure firefox. - [completion](completion): for shell completion files. + The completion files need [INSTALL_SYSTEM_FILES](/doc/COMPILE.md) to be installed. ### Scripts For Elektra Developers
Fix missing pointer operator in dcd_nuc505.c
@@ -183,7 +183,7 @@ static void dcd_userEP_in_xfer(struct xfer_ctl_t *xfer, USBD_EP_T *ep) /* provided buffers are thankfully 32-bit aligned, allowing most data to be transfered as 32-bit */ if (xfer->ff) { - tu_fifo_read_n(xfer->ff, (void *) (ep->EPDAT_BYTE), bytes_now); + tu_fifo_read_n(xfer->ff, (void *) (&ep->EPDAT_BYTE), bytes_now); } else {
Remove TCOD_sys_init_sdl2_renderer_ function.
@@ -168,12 +168,6 @@ TCOD_PUBLIC struct SDL_Renderer* TCOD_sys_get_sdl_renderer(void); */ TCOD_PUBLIC int TCOD_sys_accumulate_console(const TCOD_Console* console); TCOD_PUBLIC int TCOD_sys_accumulate_console_(const TCOD_Console* console, const struct SDL_Rect* viewport); -TCOD_PUBLIC TCOD_NODISCARD int TCOD_sys_init_sdl2_renderer_( - int width, - int height, - const char* title, - int window_flags, - int renderer_flags); /** * This function is needed to send the root console to the C++ part of the * code.
docs: fix typo in get-started chapter
@@ -83,7 +83,7 @@ For boards with an installed USB-to-UART bridge, the connection between the pers shape = line; style = dotted; color = "#FF0000"; - label = "Developmment Board\n\n\n"; + label = "Development Board\n\n\n"; BRIDGE; CHIP; } } @@ -121,7 +121,7 @@ Sometimes the USB-to-UART bridge is external. This is often used in small develo shape = line; style = dotted; color = "#FF0000"; - label = "Programmmer Board\n\n\n"; + label = "Programmer Board\n\n\n"; BRIDGE } group {
Configurations/10-main.conf: Don't inherit assembler in Cygwin-common The targets Cygwin-x86 and Cygwin-x86_64 are the ones that should do this. Fixes
@@ -1431,7 +1431,7 @@ my %targets = ( #### Cygwin "Cygwin-common" => { - inherit_from => [ "BASE_unix", asm("x86_asm") ], + inherit_from => [ "BASE_unix" ], template => 1, CC => "gcc",
Add INVALID_ACTION alias
@@ -11,6 +11,8 @@ typedef uint8_t packet_data_t; #include <rte_spinlock.h> typedef rte_spinlock_t lock_t; +#define INVALID_ACTION -1 + #define INVALID_TABLE_ENTRY false #define VALID_TABLE_ENTRY true
tests: internal: pack: use new last_byte field for byte check
@@ -176,7 +176,6 @@ void test_json_pack_mult_iter() int out_size; msgpack_unpacked result; msgpack_object root; - jsmntok_t *t; struct flb_pack_state state; data1 = mk_file_to_buffer(JSON_SINGLE_MAP1); @@ -211,10 +210,9 @@ void test_json_pack_mult_iter() ret = flb_pack_json_state(buf, i, &out_buf, &out_size, &state); if (ret == 0) { /* Consume processed bytes */ - t = &state.tokens[0]; - consume_bytes(buf, t->end, total); + consume_bytes(buf, state.last_byte, total); i = 1; - total -= t->end; + total -= state.last_byte; flb_pack_state_reset(&state); flb_pack_state_init(&state);
Changed an include from gl4es to gles
#ifndef _GL4ES_VERTEXATTRIB_H_ #define _GL4ES_VERTEXATTRIB_H_ -#include "gl4es.h" +#include "gles.h" -// actual definition of vertexattrib_t is in buffer.h, has they are part of VAO... +// actual definition of vertexattrib_t is in buffer.h, as they are part of VAO... void gl4es_glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer); void gl4es_glEnableVertexAttribArray(GLuint index);
nrf/boards/microbit: Update docs on top level tick low pri callback.
@@ -357,8 +357,7 @@ static void microbit_display_update(void) { #define GREYSCALE_MASK ((1<<MAX_BRIGHTNESS)-2) -/* This is the top-level animation/display callback. It is not a registered - * callback. */ +/* This is the top-level animation/display registered callback. */ void microbit_display_tick(void) { /* Do nothing if the display is not active. */ if (!microbit_display_obj.active) {
[hardware] Register the DMA metadata
@@ -45,8 +45,10 @@ module mempool_cluster logic [NumCores-1:0] wake_up_q; `FF(wake_up_q, wake_up_i, '0, clk_i, rst_ni); - ro_cache_ctrl_t ro_cache_ctrl_q; - `FF(ro_cache_ctrl_q, ro_cache_ctrl_i, ro_cache_ctrl_default, clk_i, rst_ni); + ro_cache_ctrl_t [NumGroups-1:0] ro_cache_ctrl_q; + for (genvar g = 0; unsigned'(g) < NumGroups; g++) begin: gen_ro_cache_ctrl_q + `FF(ro_cache_ctrl_q[g], ro_cache_ctrl_i, ro_cache_ctrl_default, clk_i, rst_ni); + end: gen_ro_cache_ctrl_q /********* * DMA * @@ -78,7 +80,9 @@ module mempool_cluster dma_req_t [NumGroups-1:0] dma_req; logic [NumGroups-1:0] dma_req_valid; logic [NumGroups-1:0] dma_req_ready; - dma_meta_t [NumGroups-1:0] dma_meta; + dma_meta_t [NumGroups-1:0] dma_meta, dma_meta_q; + + `FF(dma_meta_q, dma_meta, '0, clk_i, rst_ni); idma_split_midend #( .DmaRegionWidth (NumBanksPerGroup*NumGroups*4), @@ -118,7 +122,7 @@ module mempool_cluster .burst_req_o (dma_req ), .valid_o (dma_req_valid ), .ready_i (dma_req_ready ), - .meta_i (dma_meta ) + .meta_i (dma_meta_q ) ); /************ @@ -166,7 +170,7 @@ module mempool_cluster .tcdm_slave_resp_valid_o (tcdm_slave_resp_valid[g] ), .tcdm_slave_resp_ready_i (tcdm_slave_resp_ready[g] ), .wake_up_i (wake_up_q[g*NumCoresPerGroup +: NumCoresPerGroup] ), - .ro_cache_ctrl_i (ro_cache_ctrl_q ), + .ro_cache_ctrl_i (ro_cache_ctrl_q[g] ), // DMA request .dma_req_i (dma_req[g] ), .dma_req_valid_i (dma_req_valid[g] ),
driver: lsm6dsm: Allow roundup to work below 13Hz Recalculate ODR properly after rounding up the requested rate. TEST=Check ODR is set properly BRANCH=none
@@ -444,7 +444,7 @@ static int set_data_rate(const struct motion_sensor_t *s, int rate, int rnd) if (rnd && (normalized_rate < rate)) { reg_val++; - normalized_rate *= 2; + normalized_rate = LSM6DSM_REG_TO_ODR(reg_val); } if (normalized_rate == 0) return EC_RES_INVALID_PARAM;
Add reconnect test
@@ -12652,11 +12652,12 @@ requires_config_enabled MBEDTLS_SSL_CLI_C requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE run_test "TLS 1.3: NewSessionTicket: Basic check, m->O" \ "$O_NEXT_SRV -msg -tls1_3 -no_resume_ephemeral -no_cache " \ - "$P_CLI debug_level=4" \ + "$P_CLI debug_level=4 reco_mode=1 reconnect=1" \ 0 \ -c "Protocol is TLSv1.3" \ -c "MBEDTLS_SSL_NEW_SESSION_TICKET" \ -c "got new session ticket." \ + -c "Saving session for reuse... ok" \ -c "HTTP/1.0 200 ok" requires_gnutls_tls1_3 @@ -12666,11 +12667,12 @@ requires_config_enabled MBEDTLS_DEBUG_C requires_config_enabled MBEDTLS_SSL_CLI_C run_test "TLS 1.3: NewSessionTicket: Basic check, m->G" \ "$G_NEXT_SRV --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+CIPHER-ALL:+PSK --disable-client-cert" \ - "$P_CLI debug_level=4" \ + "$P_CLI debug_level=4 reco_mode=1 reconnect=1" \ 0 \ -c "Protocol is TLSv1.3" \ -c "MBEDTLS_SSL_NEW_SESSION_TICKET" \ -c "got new session ticket." \ + -c "Saving session for reuse... ok" \ -c "HTTP/1.0 200 OK" requires_openssl_tls1_3 @@ -12707,11 +12709,12 @@ requires_config_enabled MBEDTLS_SSL_CLI_C requires_config_enabled MBEDTLS_DEBUG_C run_test "TLS 1.3: NewSessionTicket: Basic check, m->m" \ "$P_SRV debug_level=4 crt_file=data_files/server5.crt key_file=data_files/server5.key force_version=tls13 tickets=1" \ - "$P_CLI debug_level=4" \ + "$P_CLI debug_level=4 reco_mode=1 reconnect=1" \ 0 \ -c "Protocol is TLSv1.3" \ -c "MBEDTLS_SSL_NEW_SESSION_TICKET" \ -c "got new session ticket." \ + -c "Saving session for reuse... ok" \ -c "HTTP/1.0 200 OK" \ -s "=> write NewSessionTicket msg" \ -s "server state: MBEDTLS_SSL_NEW_SESSION_TICKET" \
docs - clarify gp_toolkit.gp_stats_missing smirecs description
</row> <row class="- topic/row "> <entry colname="col1" class="- topic/entry ">smirecs </entry> - <entry colname="col2" class="- topic/entry ">Number of rows in the table.</entry> + <entry colname="col2" class="- topic/entry ">The total number of columns in + the table that have statistics recorded.</entry> </row> </tbody> </tgroup>
Fix db.yml SceDeci4pUserp
@@ -1497,8 +1497,8 @@ modules: sceDTraceClientOpen: 0x761062E9 sceDTraceHelperIoctl: 0x413C420E sceDTraceRemoveHelperDof: 0xF2C9207A - SceDeci4p: - nid: 0x00000027 + SceDeci4pUserp: + nid: 0xE24F5181 libraries: SceDeci4pUserp: kernel: false
Deletion email account by default for alerts
@@ -4,13 +4,13 @@ PORT=27017 ALERTS=on DATABASE=Datafari HOURLYDELAY=31/07/2015/08\:42 [email protected] -smtp=smtp.gmail.com +user= +smtp= DAILYDELAY=02/07/2015/16\:10 WEEKLYDELAY=21/07/2015/10\:55 COLLECTION=Alerts Daily=06/04/2016/15\:10 [email protected] +from= HOST=127.0.0.1 -pass=Datafari1 +pass= Hourly=06/04/2016/15\:42
Disable cubic test for Linux for nwo.
@@ -240,7 +240,9 @@ static const picoquic_test_def_t test_table[] = { { "bdp_ip", bdp_ip_test }, { "bdp_rtt", bdp_rtt_test }, { "bdp_reno", bdp_reno_test }, +#if 0 { "bdp_cubic", bdp_cubic_test }, +#endif { "cid_length", cid_length_test }, { "optimistic_ack", optimistic_ack_test }, { "optimistic_hole", optimistic_hole_test },
Disbale dec-prim successful test, hangs UT
@@ -140,6 +140,7 @@ end: if (ctx) teardown(); } +#if 0 /* Cannot test a successful decrypt prim because it can take a long time */ /* * Test the KAT handler API. * The ctx is empty (no capabilities), expecting failure. @@ -163,6 +164,7 @@ Test(RSA_DECPRIM_API, pass) { end: if (ctx) teardown(); } +#endif /* * Test the KAT handler API.
[chainmaker][#436]modify test14 function
@@ -442,18 +442,18 @@ START_TEST(test_001CreateWallet_0013_CreateOneTimeWalletSucessHostNameMaxLen) } END_TEST -START_TEST(test_001CreateWallet_0014_CreateOneTimeWalletFailureChainIdLenExceed) +START_TEST(test_001CreateWallet_0014_CreateOneTimeWalletSucessChainIdMaxLen) { BSINT32 rtnVal; BoatHlchainmakerWallet *g_chaninmaker_wallet_ptr = NULL; BoatHlchainmakerWalletConfig wallet_config = get_chainmaker_wallet_settings(); - char chain_id[EXCEED_STR_MAX_LEN]; - for (int i = 0; i < EXCEED_STR_MAX_LEN; i++) + char chain_id[BAOT_CHAINMAKER_NODE_STR_LEN]; + for (int i = 0; i < BAOT_CHAINMAKER_NODE_STR_LEN; i++) { chain_id[i] = 'b'; } - memcpy(wallet_config.chain_id_cfg, chain_id, EXCEED_STR_MAX_LEN); + memcpy(wallet_config.chain_id_cfg, chain_id, BAOT_CHAINMAKER_NODE_STR_LEN); extern BoatIotSdkContext g_boat_iot_sdk_context; /* 1. execute unit test */ @@ -461,12 +461,14 @@ START_TEST(test_001CreateWallet_0014_CreateOneTimeWalletFailureChainIdLenExceed) /* 2. verify test result */ /* 2-1. verify the return value */ - ck_assert_int_eq(rtnVal, BOAT_ERROR); + ck_assert_int_eq(rtnVal, 0); /* 2-2. verify the global variables that be affected */ - ck_assert(g_boat_iot_sdk_context.wallet_list[0].is_used == false); + ck_assert(g_boat_iot_sdk_context.wallet_list[0].is_used == true); + g_chaninmaker_wallet_ptr = BoatGetWalletByIndex(rtnVal); - ck_assert(g_chaninmaker_wallet_ptr == NULL); + ck_assert(g_chaninmaker_wallet_ptr != NULL); + ck_assert(check_chainmaker_wallet(g_chaninmaker_wallet_ptr) == BOAT_SUCCESS); BoatIotSdkDeInit(); } END_TEST @@ -594,7 +596,7 @@ Suite *make_wallet_suite(void) tcase_add_test(tc_wallet_api, test_001CreateWallet_0011_CreatePersisWalletFailurePotocolTypeNoExit); tcase_add_test(tc_wallet_api, test_001CreateWallet_0012_CreatePersisWalletFailureIndexExceed); tcase_add_test(tc_wallet_api, test_001CreateWallet_0013_CreateOneTimeWalletSucessHostNameMaxLen); - tcase_add_test(tc_wallet_api, test_001CreateWallet_0014_CreateOneTimeWalletFailureChainIdLenExceed); + tcase_add_test(tc_wallet_api, test_001CreateWallet_0014_CreateOneTimeWalletSucessChainIdMaxLen); tcase_add_test(tc_wallet_api, test_001CreateWallet_0015_CreateOneTimeWalletFailureOrgIdLenExceed); tcase_add_test(tc_wallet_api, test_001CreateWallet_0016_CreateOneTimeWalletFailurePrikeyError); tcase_add_test(tc_wallet_api, test_001CreateWallet_0017_CreateOneTimeWalletFailureCertLenExceed);
Update ias_ace.cpp
@@ -57,7 +57,7 @@ const std::array<KeyMap, 7> RConfigArmModeValues = { { {QLatin1String("disarmed" const std::array<KeyMap, 11> RConfigPanelValues = { { {QLatin1String("disarmed")}, {QLatin1String("armed_stay")}, {QLatin1String("armed_night")}, {QLatin1String("armed_away")}, - {QLatin1String("exit_delay")}, {QLatin1String("entry_delay")}, {QLatin1String("not_ready_to_arm")}}, {QLatin1String("in_alarm")}, + {QLatin1String("exit_delay")}, {QLatin1String("entry_delay")}, {QLatin1String("not_ready_to_arm")}, {QLatin1String("in_alarm")}, {QLatin1String("arming_stay")}, {QLatin1String("arming_night")}, {QLatin1String("arming_away")} } }; const QStringList PanelStatusList({
blackbox: do not record during turtle
@@ -75,7 +75,7 @@ uint8_t blackbox_update() { data_flash_finish(); blackbox_enabled = 0; return 0; - } else if ((flags.arm_switch && rx_aux_on(AUX_BLACKBOX)) && blackbox_enabled == 0) { + } else if ((flags.arm_switch && flags.turtle_ready == 0 && rx_aux_on(AUX_BLACKBOX)) && blackbox_enabled == 0) { if (data_flash_restart(blackbox_rate, state.looptime_autodetect)) { blackbox_enabled = 1; }
Do the ToDo list and iterate over the Paths pointer
-use crate::{c_char, c_int, c_void}; -// use crate::{c_char, c_int, c_void, CStr}; +use crate::{c_char, c_int, c_void, CStr}; #[no_mangle] pub extern "C" fn rs_loader_impl_load_from_file( _loader_impl: *mut c_void, - _paths: *const *mut c_char, - _size: usize, + paths: *const *mut c_char, + size: usize, ) -> *mut c_void { - // TODO: Not working - /* for i in 0..size { - let path: *const c_char = unsafe { *(paths.offset(i as isize)) }; + let path: *const c_char = paths.wrapping_offset(i as isize) as *const c_char; let c_path: &CStr = unsafe { CStr::from_ptr(path) }; let path_slice: &str = c_path.to_str().unwrap(); println!("RUSTY: {}", path_slice); } - */ 1 as c_int as *mut c_void }
msgbuf: Remove impossible code (only generics use generic pos).
@@ -242,19 +242,6 @@ static void add_type(lily_msgbuf *msgbuf, lily_type *type) lily_mb_add(msgbuf, type->cls->name); if (type->cls->id == LILY_ID_FUNCTION) { - if (type->generic_pos) { - int i; - char ch = 'A'; - lily_mb_add(msgbuf, "["); - for (i = 0;i < type->generic_pos - 1;i++, ch++) { - lily_mb_add_char(msgbuf, ch); - lily_mb_add(msgbuf, ", "); - } - - lily_mb_add_char(msgbuf, ch); - lily_mb_add(msgbuf, "]("); - } - else lily_mb_add(msgbuf, " ("); if (type->subtype_count > 1) {
Fix cleanup when DeepScanLineInputFile constructor throws
@@ -955,7 +955,6 @@ DeepScanLineInputFile::DeepScanLineInputFile : _data (new Data (numThreads)) { - _data->_streamData = new InputStreamMutex(); _data->_deleteStream = true; OPENEXR_IMF_INTERNAL_NAMESPACE::IStream* is = 0; @@ -965,12 +964,29 @@ DeepScanLineInputFile::DeepScanLineInputFile readMagicNumberAndVersionField(*is, _data->version); // // Backward compatibility to read multpart file. - // + // multiPartInitialize will create _streamData if (isMultiPart(_data->version)) { compatibilityInitialize(*is); return; } + } + catch (IEX_NAMESPACE::BaseExc &e) + { + if (is) delete is; + if (_data) delete _data; + + REPLACE_EXC (e, "Cannot read image file " + "\"" << fileName << "\". " << e.what()); + throw; + } + + // + // not multiPart - allocate stream data and intialise as normal + // + try + { + _data->_streamData = new InputStreamMutex(); _data->_streamData->is = is; _data->memoryMapped = is->isMemoryMapped(); _data->header.readFrom (*_data->_streamData->is, _data->version);
Fix bootstrap version computing with custom bc When i have ~/.bc configuration file with content: scale=2 which is changing default behaviour (scale=0), bootstrap is not working.
@@ -17,16 +17,16 @@ fi BROTLI_ABI_HEX=`sed -n 's/#define BROTLI_ABI_VERSION 0x//p' c/common/version.h` BROTLI_ABI_INT=`echo "ibase=16;$BROTLI_ABI_HEX" | bc` -BROTLI_ABI_CURRENT=`echo "$BROTLI_ABI_INT / 16777216" | bc` -BROTLI_ABI_REVISION=`echo "$BROTLI_ABI_INT / 4096 % 4096" | bc` -BROTLI_ABI_AGE=`echo "$BROTLI_ABI_INT % 4096" | bc` +BROTLI_ABI_CURRENT=`echo "scale=0;$BROTLI_ABI_INT / 16777216" | bc` +BROTLI_ABI_REVISION=`echo "scale=0;$BROTLI_ABI_INT / 4096 % 4096" | bc` +BROTLI_ABI_AGE=`echo "scale=0;$BROTLI_ABI_INT % 4096" | bc` BROTLI_ABI_INFO="$BROTLI_ABI_CURRENT:$BROTLI_ABI_REVISION:$BROTLI_ABI_AGE" BROTLI_VERSION_HEX=`sed -n 's/#define BROTLI_VERSION 0x//p' c/common/version.h` BROTLI_VERSION_INT=`echo "ibase=16;$BROTLI_VERSION_HEX" | bc` -BROTLI_VERSION_MAJOR=`echo "$BROTLI_VERSION_INT / 16777216" | bc` -BROTLI_VERSION_MINOR=`echo "$BROTLI_VERSION_INT / 4096 % 4096" | bc` -BROTLI_VERSION_PATCH=`echo "$BROTLI_VERSION_INT % 4096" | bc` +BROTLI_VERSION_MAJOR=`echo "scale=0;$BROTLI_VERSION_INT / 16777216" | bc` +BROTLI_VERSION_MINOR=`echo "scale=0;$BROTLI_VERSION_INT / 4096 % 4096" | bc` +BROTLI_VERSION_PATCH=`echo "scale=0;$BROTLI_VERSION_INT % 4096" | bc` BROTLI_VERSION="$BROTLI_VERSION_MAJOR.$BROTLI_VERSION_MINOR.$BROTLI_VERSION_PATCH" sed -i.bak "$SED_ERE" "s/[0-9]+:[0-9]+:[0-9]+/$BROTLI_ABI_INFO/" Makefile.am
capture floating point exception checking logic for future use
#include <string> #include <vector> +#ifdef FECHECKS +#include <fenv.h> +#endif + using std::string; using std::vector; using std::ostringstream; @@ -219,6 +223,8 @@ avtFilter::UpdateProgress(int current, int total) // Take memory measurements on BGQ so we can get an idea of how much // memory is used/left. // +// Mark C. Miller, Thu Apr 27 18:08:19 PDT 2017 +// Capture floating point exception (FE) logic for future use. // **************************************************************************** bool @@ -288,9 +294,28 @@ avtFilter::Update(avtContract_p contract) DumpDataObject(GetInput(), "input"); numInExecute++; +#ifdef FECHECKS + feclearexcept(FE_ALL_EXCEPT); +#endif + PreExecute(); Execute(); PostExecute(); + +#ifdef FECHECKS + int feerr = fetestexcept(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW); + if (feerr) + { + feclearexcept(FE_ALL_EXCEPT); + debug1 << "FPE(s) encountered in " << GetType() << " "; + if (feerr & FE_INVALID) debug1 << "FE_INVALID "; + if (feerr & FE_DIVBYZERO) debug1 << "FE_DIVBYZERO "; + if (feerr & FE_OVERFLOW) debug1 << "FE_OVERFLOW "; + if (feerr & FE_UNDERFLOW) debug1 << "FE_UNDERFLOW "; + debug1 << endl; + } +#endif + if (debug_dump) DumpDataObject(GetOutput(), "output"); UpdateProgress(1, 0);
file-server: print a warning when binding fails
?+ +<.sign (on-arvo:def wire sign) %bound ?: accepted.sign [~ this] + ~& [dap.bowl %failed-to-bind path.binding.sign] [~ this(serving (~(del by serving) path.binding.sign))] == ::
RTX5: typo correction in documentation
@@ -1209,7 +1209,7 @@ RTX does not implement any confidence test for memory validation. This should be Keil RTX v5 kernel functions are executed in handler mode (using PendSV/SysTick/SVC) and the tables below lists the maximum stack requirements for the Main Stack (MSP) that the user should consider. -The stack for the \ref osKernelStart function is referred as "Startup" and RTX v5 uses 32 bytes (with Arm Compiler). However the should also consider additional stack that +The stack for the \ref osKernelStart function is referred as "Startup" and RTX v5 uses 32 bytes (with Arm Compiler). However the user should also consider additional stack that might be allocated by the 'main' function of the embedded application. The following picture shows a worst-case memory allocation of the Main Stack. \image html "KernelStackUsage.png" "Main Stack usage of RTX v5 applications"
apps/system/dhcpc: Add missing argument of fprintf.
static void dhcpc_showusage(FAR const char *progname, int exitcode) { - fprintf(stderr, "Usage: %s <device-name>\n"); + fprintf(stderr, "Usage: %s <device-name>\n", progname); exit(exitcode); }
Added the ability to parse IPs enclosed within brackets (e.g., IPv6). This fixes were it was unable to parse both IPv4/v6 coming from Caddy.
@@ -931,6 +931,10 @@ parse_specifier (GLogItem * logitem, char **str, const char *p, const char *end) case 'h': if (logitem->host) return 0; + /* per https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2 */ + /* square brackets are possible */ + if (*str[0] == '[' && (*str += 1) && **str) + end = "]"; if (!(tkn = parse_string (&(*str), end, 1))) return spec_err (logitem, SPEC_TOKN_NUL, *p, NULL);
GetObjectStatus call added to the SetAlarmThresholds func
@@ -2113,7 +2113,6 @@ SetAlarmThresholds ( PT_PAYLOAD_ALARM_THRESHOLDS *pPayloadAlarmThresholds = NULL; UINT32 Index = 0; #ifdef OS_BUILD - LIST_ENTRY *pObjectStatusNode = NULL; OBJECT_STATUS *pObjectStatus = NULL; #endif // OS_BUILD @@ -2178,16 +2177,7 @@ SetAlarmThresholds ( } } - for ((Index = 0) -#ifdef OS_BUILD - ,(pObjectStatusNode = (&pCommandStatus->ObjectStatusList)->ForwardLink) -#endif // OS_BUILD - ; Index < DimmsNum; - (Index++) -#ifdef OS_BUILD - ,(pObjectStatusNode = pObjectStatusNode->ForwardLink) -#endif // OS_BUILD - ) { + for ((Index = 0); Index < DimmsNum; (Index++)) { // let's read current values so we'll not overwrite them during setting ReturnCode = FwCmdGetAlarmThresholds(pDimms[Index], &pPayloadAlarmThresholds); if (pPayloadAlarmThresholds == NULL) { @@ -2240,7 +2230,7 @@ SetAlarmThresholds ( } else { SetObjStatusForDimm(pCommandStatus, pDimms[Index], NVM_SUCCESS); #ifdef OS_BUILD - pObjectStatus = OBJECT_STATUS_FROM_NODE(pObjectStatusNode); + pObjectStatus = GetObjectStatus(pCommandStatus, pDimms[Index]->DeviceHandle.AsUint32); CHAR16 *pTmpStr = HiiGetString(gNvmDimmData->HiiHandle, STRING_TOKEN(STR_CONFIG_SENSOR_SET_CHANGED), NULL); nvm_store_system_entry_widechar(NVM_SYSLOG_SRC_W, SYSTEM_EVENT_CREATE_EVENT_TYPE(SYSTEM_EVENT_CAT_MGMT, SYSTEM_EVENT_TYPE_INFO, EVENT_CONFIG_CHANGE_305, FALSE, TRUE, TRUE, FALSE, 0),
driver/retimer/ps8811.c: Format with clang-format BRANCH=none TEST=none
@@ -15,9 +15,7 @@ int ps8811_i2c_read(const struct usb_mux *me, int page, int offset, int *data) { int rv; - rv = i2c_read8(me->i2c_port, - me->i2c_addr_flags + page, - offset, data); + rv = i2c_read8(me->i2c_port, me->i2c_addr_flags + page, offset, data); return rv; } @@ -26,9 +24,7 @@ int ps8811_i2c_write(const struct usb_mux *me, int page, int offset, int data) { int rv; - rv = i2c_write8(me->i2c_port, - me->i2c_addr_flags + page, - offset, data); + rv = i2c_write8(me->i2c_port, me->i2c_addr_flags + page, offset, data); return rv; } @@ -38,11 +34,8 @@ int ps8811_i2c_field_update(const struct usb_mux *me, int page, int offset, { int rv; - rv = i2c_field_update8(me->i2c_port, - me->i2c_addr_flags + page, - offset, - field_mask, - set_value); + rv = i2c_field_update8(me->i2c_port, me->i2c_addr_flags + page, offset, + field_mask, set_value); return rv; }
Doc: fixing the intel_pstate kernel command line setting There seems to be a typo in the documentation.
@@ -177,7 +177,7 @@ Tip: Disable the Intel processor C-State and P-State of the RTVM. Power management of a processor could save power, but it could also impact the RT performance because the power state is changing. C-State and P-State PM mechanism can be disabled by adding ``processor.max_cstate=0 - intel_idle.max_cstate=0 intel_pstate=disabled`` to the kernel parameters. + intel_idle.max_cstate=0 intel_pstate=disable`` to the kernel parameters. Tip: Exercise caution when setting ``/proc/sys/kernel/sched_rt_runtime_us``. Setting ``/proc/sys/kernel/sched_rt_runtime_us`` to ``-1`` can be a
macserial: Fix build with emcc
@@ -124,7 +124,7 @@ static bool verify_mlb_checksum(const char *mlb, size_t len) { // I am not positive what is better to use here (especially on Windows). // Fortunately we only need something only looking random. static uint32_t pseudo_random(void) { - #ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__EMSCRIPTEN__) if (arc4random) return arc4random(); #endif @@ -149,7 +149,7 @@ static uint32_t pseudo_random(void) { static uint32_t pseudo_random_between(uint32_t from, uint32_t to) { uint32_t upper_bound = to + 1 - from; -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__EMSCRIPTEN__) // Prefer native implementation if available. if (arc4random_uniform) return from + arc4random_uniform(upper_bound);
zephyr/shim/chip/mchp/system_external_storage.c: Format with clang-format BRANCH=none TEST=none
#define MCHP_ECRW_WORD 0x57524345u /* ASCII ECRW */ #define MCHP_PCR_NODE DT_INST(0, microchip_xec_pcr) -#define GET_BBRAM_OFS(node) \ - DT_PROP(DT_PATH(named_bbram_regions, node), offset) +#define GET_BBRAM_OFS(node) DT_PROP(DT_PATH(named_bbram_regions, node), offset) #define GET_BBRAM_SZ(node) DT_PROP(DT_PATH(named_bbram_regions, node), size) static const struct device *const bbram_dev = @@ -49,8 +48,8 @@ void system_jump_to_booter(void) */ switch (system_get_shrspi_image_copy()) { case EC_IMAGE_RW: - flash_offset = CONFIG_EC_WRITABLE_STORAGE_OFF + - CONFIG_RW_STORAGE_OFF; + flash_offset = + CONFIG_EC_WRITABLE_STORAGE_OFF + CONFIG_RW_STORAGE_OFF; flash_used = CONFIG_CROS_EC_RW_SIZE; break; case EC_IMAGE_RO:
perf(non-null judgment): add non-null judgment of "message.args" in "boathlfabric_discovery.c"
@@ -264,6 +264,10 @@ __BOATSTATIC BOAT_RESULT hlfabricDiscoveryPayloadDataPacked(BoatHlfabricTx *tx_p message.n_args = 1; message.args = BoatMalloc((message.n_args) * sizeof(ProtobufCBinaryData)); + if(message.args == NULL){ + BoatLog(BOAT_LOG_CRITICAL, "Fail to allocate message.args buffer."); + boat_throw(BOAT_ERROR_COMMON_OUT_OF_MEMORY, hlfabricDiscoveryPayloadDataPacked_exception); + } message.args[0].data = (BUINT8*)tx_ptr->var.channelId; message.args[0].len = strlen(tx_ptr->var.channelId);
Bug fix for daoSent update.
@@ -644,7 +644,6 @@ void icmpv6rpl_timer_DAO_task() { // send DAO sendDAO(); - icmpv6rpl_vars.daoSent = TRUE; // arm the DAO timer with this new value daoPeriod = icmpv6rpl_vars.daoPeriod - 0x80 + (openrandom_get16b()&0xff); @@ -814,6 +813,7 @@ void sendDAO() { //===== send if (icmpv6_send(msg)==E_SUCCESS) { icmpv6rpl_vars.busySendingDAO = TRUE; + icmpv6rpl_vars.daoSent = TRUE; } else { openqueue_freePacketBuffer(msg); }
Add tests for version/ciphersuite sanity checks The previous commits added sanity checks for where the max enabled protocol version does not have any configured ciphersuites. We should check that we fail in those circumstances.
@@ -129,6 +129,37 @@ sub generate_version_tests { } } } + return @tests if disabled("tls1_3") || disabled("tls1_2") || $dtls; + + #Add some version/ciphersuite sanity check tests + push @tests, { + "name" => "ciphersuite-sanity-check-client", + "client" => { + #Offering only <=TLSv1.2 ciphersuites with TLSv1.3 should fail + "CipherString" => "AES128-SHA", + }, + "server" => { + "MaxProtocol" => "TLSv1.2" + }, + "test" => { + "ExpectedResult" => "ClientFail", + } + }; + push @tests, { + "name" => "ciphersuite-sanity-check-server", + "client" => { + "CipherString" => "AES128-SHA", + "MaxProtocol" => "TLSv1.2" + }, + "server" => { + #Allowing only <=TLSv1.2 ciphersuites with TLSv1.3 should fail + "CipherString" => "AES128-SHA", + }, + "test" => { + "ExpectedResult" => "ServerFail", + } + }; + return @tests; }
fix bug in ksLookupByName where invalid names have not been checked
@@ -2740,7 +2740,10 @@ Key * ksLookupByName (KeySet * ks, const char * name, elektraLookupFlags options struct _Key key; key.meta = NULL; keyInit (&key); - keySetName (&key, name); + if (keySetName (&key, name) == -1) + { + return 0; + } found = ksLookup (ks, &key, options); keyNameDel (key.keyName, true);
nimble/ll: Fix overwriting conn stats with DTM enabled
@@ -742,7 +742,9 @@ ble_ll_count_rx_stats(struct ble_mbuf_hdr *hdr, uint16_t len, uint8_t pdu_type) #if MYNEWT_VAL(BLE_LL_DTM) /* Reuse connection stats for DTM */ + if (!connection_data) { connection_data = (BLE_MBUF_HDR_RX_STATE(hdr) == BLE_LL_STATE_DTM); + } #endif if (crcok) {
process: exclude from kdb check test, process wont work without a config
@@ -49,6 +49,10 @@ do # exclude due to issue 1781 continue ;; + "process") + # does not work without an existing plugin to proxy + continue + ;; esac # The following checks fail on an ASAN enabled build
MSR: Support double quotes in standard output
@@ -4,7 +4,7 @@ replace_newline_return () { regex_escape () { sed 's/\\/\\\\/g' | sed 's/\[/\\\[/g' | sed 's/\]/\\\]/g' | sed 's/\./\\\./g' | sed 's/\*/\\\*/g' | sed 's/\?/\\\?/g' \ - | sed 's/(/\\\(/g' | sed 's/)/\\\)/g' + | sed 's/(/\\\(/g' | sed 's/)/\\\)/g' | sed 's/"/\\"/g' } if [ -z "@USE_CMAKE_KDB_COMMAND@" ]; then