message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
BugID:24500332:[umesh2]fix generic mutex is not release in deinit issue
|
@@ -727,7 +727,9 @@ static int service_state_deinit(service_state_t *state)
hal_mutex_unlock(state->lock);
hal_semaphore_free(state->leave_semp);
+ state->leave_semp = NULL;
hal_mutex_free(state->lock);
+ state->lock = NULL;
hal_free(state);
return 0;
}
|
cast type to avoid warning
|
@@ -484,7 +484,7 @@ static scs_int proj_semi_definite_cone(scs_float *X, const scs_int n,
/* Solve eigenproblem, reuse workspaces */
BLAS(syev)("Vectors", "Lower", &nb, Xs, &nb, e, work, &lwork, &info);
if (info != 0) {
- scs_printf("WARN: LAPACK syev error, info = %i\n", info);
+ scs_printf("WARN: LAPACK syev error, info = %i\n", (int) info);
if (info < 0) {
return info;
}
|
esp32/mpthreadport: Don't explicitly free thread struct in TCB cleanup.
Because vPortCleanUpTCB runs on the FreeRTOS idle task and cannot execute
any VM or runtime related code like freeing memory.
|
@@ -166,6 +166,8 @@ void mp_thread_finish(void) {
mp_thread_mutex_unlock(&thread_mutex);
}
+// This is called from the FreeRTOS idle task and is not within Python context,
+// so MP_STATE_THREAD is not valid and it does not have the GIL.
void vPortCleanUpTCB(void *tcb) {
if (thread == NULL) {
// threading not yet initialised
@@ -182,8 +184,7 @@ void vPortCleanUpTCB(void *tcb) {
// move the start pointer
thread = th->next;
}
- // explicitly release all its memory
- m_del(thread_t, th, 1);
+ // The "th" memory will eventually be reclaimed by the GC.
break;
}
}
|
Typo in SSL_CTX_sess_number.pod - started
|
@@ -32,7 +32,7 @@ client mode.
SSL_CTX_sess_connect_good() returns the number of successfully established
SSL/TLS sessions in client mode.
-SSL_CTX_sess_connect_renegotiate() returns the number of start renegotiations
+SSL_CTX_sess_connect_renegotiate() returns the number of started renegotiations
in client mode.
SSL_CTX_sess_accept() returns the number of started SSL/TLS handshakes in
@@ -41,7 +41,7 @@ server mode.
SSL_CTX_sess_accept_good() returns the number of successfully established
SSL/TLS sessions in server mode.
-SSL_CTX_sess_accept_renegotiate() returns the number of start renegotiations
+SSL_CTX_sess_accept_renegotiate() returns the number of started renegotiations
in server mode.
SSL_CTX_sess_hits() returns the number of successfully reused sessions.
|
bootloader: Change range of the factory reset pin in Kconfig
Closes:
|
@@ -123,7 +123,8 @@ menu "Bootloader config"
config BOOTLOADER_NUM_PIN_FACTORY_RESET
int "Number of the GPIO input for factory reset"
depends on BOOTLOADER_FACTORY_RESET
- range 0 39
+ range 0 39 if IDF_TARGET_ESP32
+ range 0 44 if IDF_TARGET_ESP32S2
default 4
help
The selected GPIO will be configured as an input with internal pull-up enabled.
|
YAJL: Add required `array` metadata in test
|
@@ -161,6 +161,10 @@ kdb set user/tests/yajl/roots/bloody/roots 'No Roots'
# Add an array containing two elements
kdb set user/tests/yajl/now ', Now'
+# Elektra arrays require the metakey `array` to the parent.
+# Otherwise the keys below `user/tests/yajl/now` would be
+# interpreted as normal key-value pairs.
+kdb meta-set user/tests/yajl/now array ''
kdb set user/tests/yajl/now/#0 'Neighbors'
kdb set user/tests/yajl/now/#1 'Threads'
|
[consensus] Panic upon no Consensus or BlockFactory
|
@@ -59,7 +59,7 @@ type BlockFactory interface {
func Start(c Consensus) {
bf := c.BlockFactory()
if c == nil || bf == nil {
- logger.Errorf("failed to start consensus service (no Consensus or BlockFactory)")
+ logger.Fatal("failed to start consensus service: no Consensus or BlockFactory")
}
go bf.Start()
|
compiler/sim: Add --gc-sections option to the linker
This patch make sure that image does not contain
not used functions and data as it is done for other targets
|
@@ -25,7 +25,7 @@ compiler.path.archive: "ar"
compiler.path.objdump: "objdump"
compiler.path.objsize: "size"
compiler.path.objcopy: "objcopy"
-compiler.flags.base: [-m32, -Wall, -Werror, -ggdb]
+compiler.flags.base: [-m32, -Wall, -Werror, -ggdb, -ffunction-sections, -fdata-sections]
compiler.ld.resolve_circular_deps: true
compiler.flags.default: [compiler.flags.base, -O1]
@@ -33,7 +33,7 @@ compiler.flags.debug: [compiler.flags.base, -O0]
compiler.as.flags: [-x, assembler-with-cpp]
compiler.ld.mapfile: false
compiler.ld.binfile: false
-compiler.ld.flags: [-lm]
+compiler.ld.flags: -lm -Wl,--gc-sections
# Linux.
compiler.flags.base.LINUX: [-DMN_LINUX]
@@ -45,6 +45,7 @@ compiler.path.as.DARWIN.OVERWRITE: "gcc"
compiler.path.objdump.DARWIN.OVERWRITE: "gobjdump"
compiler.path.objcopy.DARWIN.OVERWRITE: "gobjcopy"
compiler.flags.base.DARWIN: [-DMN_OSX, -Wno-missing-braces]
+compiler.ld.flags.DARWIN.OVERWRITE: -lm -Wl,-dead_strip
compiler.ld.resolve_circular_deps.DARWIN.OVERWRITE: false
compiler.path.cc.FREEBSD.OVERWRITE: "gcc8"
|
highlevel: fix more memleaks
|
@@ -212,16 +212,21 @@ void elektraErrorReset (ElektraError ** error)
elektraFree (actualError->description);
}
- if (actualError->lowLevelError != NULL && actualError->lowLevelError->warnings != NULL)
+ ElektraKDBError * kdbError = actualError->lowLevelError;
+ if (kdbError != NULL)
{
- for (int i = 0; i < actualError->lowLevelError->warningCount; ++i)
+ if (kdbError->warnings != NULL)
{
- elektraFree (actualError->lowLevelError->warnings[i]);
+ for (int i = 0; i < kdbError->warningCount; ++i)
+ {
+ elektraFree (kdbError->warnings[i]);
+ }
+ elektraFree (kdbError->warnings);
}
- elektraFree (actualError->lowLevelError->warnings);
+ elektraFree (kdbError);
}
- elektraFree (*error);
+ elektraFree (actualError);
*error = NULL;
}
|
fix assertion comparison
|
@@ -359,7 +359,7 @@ static void mi_heap_absorb(mi_heap_t* heap, mi_heap_t* from) {
// turns out to be ok as `_mi_heap_delayed_free` only visits the list and calls a
// the regular `_mi_free_delayed_block` which is safe.
_mi_heap_delayed_free(from);
- mi_assert_internal(from->thread_delayed_free == NULL);
+ mi_assert_internal(mi_atomic_load_ptr_relaxed(mi_block_t,&from->thread_delayed_free) == NULL);
// and reset the `from` heap
mi_heap_reset_pages(from);
|
pr_occlum: add rune kill test
Fixes:
|
@@ -78,5 +78,11 @@ jobs:
sed -i 's#/var/run/rune/liberpal-skeleton-v2.so#/opt/occlum/build/lib/libocclum-pal.so#g' config.json;
rune --debug run occlum-app && rm -rf rootfs config.json"
+ - uses: ./.github/actions/rune-kill
+ timeout-minutes: 3
+ with:
+ container-id: ${{ env.rune_test }}
+ container-name: occlum-app
+
- name: Kill the container
run: docker stop $rune_test
|
posix: use buffered pipes for fifo
|
@@ -756,7 +756,7 @@ int posix_mkfifo(const char *pathname, mode_t mode)
if ((proc_lookup("/dev/posix/pipes", NULL, &pipesrv)) < 0)
return set_errno(-ENOSYS);
- if (proc_create(pipesrv.port, pxPipe, 0, oid, pipesrv, NULL, &oid) < 0)
+ if (proc_create(pipesrv.port, pxBufferPipe, 0, oid, pipesrv, NULL, &oid) < 0)
return set_errno(-EIO);
/* link pipe in posix server */
|
fixed Kconfig IDLE hook config
|
@@ -51,11 +51,16 @@ config RT_USING_OVERFLOW_CHECK
config RT_USING_HOOK
bool "Enable system hook"
default y
+ select RT_USING_IDLE_HOOK
help
Enable the hook function when system running, such as idle thread hook,
thread context switch etc.
- if RT_USING_HOOK
+config RT_USING_IDLE_HOOK
+ bool "Enable IDLE Task hook"
+ default y if RT_USING_HOOK
+
+ if RT_USING_IDLE_HOOK
config RT_IDEL_HOOK_LIST_SIZE
int "The max size of idel hook list"
default 4
|
idf_tools.py: fix downloading for tools which have "on_request" options for some platforms.
'install' and 'download' options can be used for 'required' or 'all' tools
|
@@ -1065,7 +1065,10 @@ def action_download(args):
tool_for_platform = tool_obj.copy_for_platform(platform)
tools_info_for_platform[name] = tool_for_platform
- if 'all' in tools_spec:
+ if not tools_spec or 'required' in tools_spec:
+ tools_spec = [k for k, v in tools_info_for_platform.items() if v.get_install_type() == IDFTool.INSTALL_ALWAYS]
+ info('Downloading tools for {}: {}'.format(platform, ', '.join(tools_spec)))
+ elif 'all' in tools_spec:
tools_spec = [k for k, v in tools_info_for_platform.items() if v.get_install_type() != IDFTool.INSTALL_NEVER]
info('Downloading tools for {}: {}'.format(platform, ', '.join(tools_spec)))
@@ -1084,7 +1087,9 @@ def action_download(args):
raise SystemExit(1)
if tool_version is None:
tool_version = tool_obj.get_recommended_version()
- assert tool_version is not None
+ if tool_version is None:
+ fatal('tool {} not found for {} platform'.format(tool_name, platform))
+ raise SystemExit(1)
tool_spec = '{}@{}'.format(tool_name, tool_version)
info('Downloading {}'.format(tool_spec))
@@ -1096,7 +1101,7 @@ def action_download(args):
def action_install(args):
tools_info = load_tools_info()
tools_spec = args.tools
- if not tools_spec:
+ if not tools_spec or 'required' in tools_spec:
tools_spec = [k for k, v in tools_info.items() if v.get_install_type() == IDFTool.INSTALL_ALWAYS]
info('Installing tools: {}'.format(', '.join(tools_spec)))
elif 'all' in tools_spec:
@@ -1254,14 +1259,18 @@ def main(argv):
'will be used instead. If this flag is given, the version in PATH ' +
'will be used.', action='store_true')
install = subparsers.add_parser('install', help='Download and install tools into the tools directory')
- install.add_argument('tools', nargs='*', help='Tools to install. ' +
- 'To install a specific version use tool_name@version syntax.' +
+ install.add_argument('tools', metavar='TOOL', nargs='*', default=['required'],
+ help='Tools to install. ' +
+ 'To install a specific version use <tool_name>@<version> syntax. ' +
+ 'Use empty or \'required\' to install required tools, not optional ones. ' +
'Use \'all\' to install all tools, including the optional ones.')
download = subparsers.add_parser('download', help='Download the tools into the dist directory')
download.add_argument('--platform', help='Platform to download the tools for')
- download.add_argument('tools', nargs='+', help='Tools to download. ' +
- 'To download a specific version use tool_name@version syntax.' +
+ download.add_argument('tools', metavar='TOOL', nargs='*', default=['required'],
+ help='Tools to download. ' +
+ 'To download a specific version use <tool_name>@<version> syntax. ' +
+ 'Use empty or \'required\' to download required tools, not optional ones. ' +
'Use \'all\' to download all tools, including the optional ones.')
if IDF_MAINTAINER:
|
[Textpad] Use a white background
|
@@ -23,6 +23,9 @@ int main(int argc, char** argv) {
window,
(gui_window_resized_cb_t)_input_sizer
);
+ input->background_color = color_white();
+ // Necessary to display the updated background color
+ gui_text_view_clear(input);
gui_enter_event_loop();
|
Remove use of malloc in lists.c
Note still a call to free since valueToString hasn't been updated
|
@@ -223,7 +223,7 @@ static Value joinListItem(VM *vm, int argCount, Value *args) {
char *output;
char *fullString = NULL;
- int index = 0;
+ int length = 0;
int delimiterLength = strlen(delimiter);
for (int j = 0; j < list->values.count - 1; ++j) {
@@ -233,15 +233,16 @@ static Value joinListItem(VM *vm, int argCount, Value *args) {
output = valueToString(list->values.values[j]);
}
int elementLength = strlen(output);
- fullString = realloc(fullString, index + elementLength + delimiterLength + 1);
- memcpy(fullString + index, output, elementLength);
+ fullString = GROW_ARRAY(vm, fullString, char, length, length + elementLength + delimiterLength);
+
+ memcpy(fullString + length, output, elementLength);
if (!IS_STRING(list->values.values[j])) {
free(output);
}
- index += elementLength;
- memcpy(fullString + index, delimiter, delimiterLength);
- index += delimiterLength;
+ length += elementLength;
+ memcpy(fullString + length, delimiter, delimiterLength);
+ length += delimiterLength;
}
// Outside the loop as we do not want the append the delimiter on the last element
@@ -252,19 +253,17 @@ static Value joinListItem(VM *vm, int argCount, Value *args) {
}
int elementLength = strlen(output);
- fullString = realloc(fullString, index + elementLength + 1);
- memcpy(fullString + index, output, elementLength);
- index += elementLength;
+ fullString = GROW_ARRAY(vm, fullString, char, length, length + elementLength + 1);
+ memcpy(fullString + length, output, elementLength);
+ length += elementLength;
- fullString[index] = '\0';
+ fullString[length] = '\0';
if (!IS_STRING(list->values.values[list->values.count - 1])) {
free(output);
}
- Value ret = OBJ_VAL(copyString(vm, fullString, index));
- free(fullString);
- return ret;
+ return OBJ_VAL(takeString(vm, fullString, length));
}
static Value copyListShallow(VM *vm, int argCount, Value *args) {
|
zephyr: herobrine: Enable VBOOT and EFS2
Enable VBOOT and EFS2 for herobrine.
BRANCH=none
TEST=Verify EC software sync with locally build AP firmware.
|
@@ -51,9 +51,6 @@ CONFIG_PLATFORM_EC_POWER_SLEEP_FAILURE_DETECTION=y
CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK=y
CONFIG_PLATFORM_EC_CHIPSET_RESUME_INIT_HOOK=y
-# TODO(b:193719620): Enable EC EFS2.
-CONFIG_PLATFORM_EC_VBOOT_EFS2=n
-
# MKBP event mask
CONFIG_PLATFORM_EC_MKBP_EVENT_WAKEUP_MASK=y
CONFIG_PLATFORM_EC_MKBP_HOST_EVENT_WAKEUP_MASK=y
|
afu_test: fix memory leak in regex_t struct
Use regex_t in a unique_ptr with a custom deleter that calls regree.
|
#include <unistd.h>
#include <chrono>
#include <future>
+#include <memory>
#include <random>
#include <thread>
@@ -73,14 +74,18 @@ union pcie_address {
static pcie_address parse(const char *s)
{
- regex_t re;
+ auto deleter = [&](regex_t *r){
+ regfree(r);
+ delete r;
+ };
+ std::unique_ptr<regex_t, decltype(deleter)> re(new regex_t, deleter);
regmatch_t matches[MATCHES_SIZE];
- int reg_res = regcomp(&re, sbdf_pattern, REG_EXTENDED | REG_ICASE);
+ int reg_res = regcomp(re.get(), sbdf_pattern, REG_EXTENDED | REG_ICASE);
if (reg_res)
throw std::runtime_error("could not compile regex");
- reg_res = regexec(&re, s, MATCHES_SIZE, matches, 0);
+ reg_res = regexec(re.get(), s, MATCHES_SIZE, matches, 0);
if (reg_res)
throw std::runtime_error("pcie address not valid format");
|
publish: add delete note front-end for note author
|
@@ -33,6 +33,7 @@ export class Note extends Component {
});
this.scrollElement = React.createRef();
this.onScroll = this.onScroll.bind(this);
+ this.deletePost = this.deletePost.bind(this);
}
componentWillMount() {
@@ -47,6 +48,16 @@ export class Note extends Component {
window.api.fetchNote(this.props.ship, this.props.book, this.props.note);
}
+ componentDidMount() {
+ if (!(this.props.notebooks[this.props.ship]) ||
+ !(this.props.notebooks[this.props.ship][this.props.book]) ||
+ !(this.props.notebooks[this.props.ship][this.props.book].notes[this.props.note]) ||
+ !(this.props.notebooks[this.props.ship][this.props.book].notes[this.props.note].file)) {
+ window.api.fetchNote(this.props.ship, this.props.book, this.props.note);
+ }
+ this.onScroll();
+ }
+
componentDidUpdate(prevProps) {
if (!(this.props.notebooks[this.props.ship]) ||
!(this.props.notebooks[this.props.ship][this.props.book]) ||
@@ -97,15 +108,23 @@ export class Note extends Component {
}
}
- componentDidMount() {
- if (!(this.props.notebooks[this.props.ship]) ||
- !(this.props.notebooks[this.props.ship][this.props.book]) ||
- !(this.props.notebooks[this.props.ship][this.props.book].notes[this.props.note]) ||
- !(this.props.notebooks[this.props.ship][this.props.book].notes[this.props.note].file))
- {
- window.api.fetchNote(this.props.ship, this.props.book, this.props.note);
+ deletePost() {
+ const { props } = this;
+ let deleteAction = {
+ "del-note": {
+ who: this.props.ship.slice(1),
+ book: this.props.book,
+ note: this.props.note,
}
- this.onScroll();
+ }
+ let popout = (props.popout) ? "popout/" : "";
+ let baseUrl = `/~publish/${popout}notebook/${props.ship}/${props.book}`;
+ window.api.setSpinner(true);
+ window.api.action("publish", "publish-action", deleteAction)
+ .then(() => {
+ window.api.setSpinner(false);
+ props.history.push(baseUrl);
+ });
}
render() {
@@ -156,8 +175,11 @@ export class Note extends Component {
let editPost = null;
let editUrl = props.location.pathname + "/edit";
if (`~${window.ship}` === author) {
- editPost =
+ editPost = <div className="dib">
<Link className="green2 f9" to={editUrl}>Edit</Link>
+ <p className="dib f9 red2 ml2 pointer"
+ onClick={(() => this.deletePost())}>Delete</p>
+ </div>
}
let popout = (props.popout) ? "popout/" : "";
|
Add black link to bpf file header
|
@@ -16,3 +16,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
+
|
Patch CBMC queue stubs to allocate objects of sizes CBMC can model.
|
#include "queue.h"
#include "queue_datastructure.h"
+#ifndef CBMC_OBJECT_BITS
+#define CBMC_OBJECT_BITS 7
+#endif
+
+#ifndef CBMC_OBJECT_MAX_SIZE
+#define CBMC_OBJECT_MAX_SIZE (UINT32_MAX>>(CBMC_OBJECT_BITS+1))
+#endif
+
/* Using prvCopyDataToQueue together with prvNotifyQueueSetContainer
leads to a problem space explosion. Therefore, we use this stub
and a sepearted proof on prvCopyDataToQueue to deal with it.
@@ -55,11 +63,12 @@ QueueHandle_t xUnconstrainedQueueBoundedItemSize( UBaseType_t uxItemSizeBound )
uint8_t ucQueueType;
__CPROVER_assume(uxQueueLength > 0);
__CPROVER_assume(uxItemSize < uxItemSizeBound);
- /* The implicit assumption for the QueueGenericCreate method is,
- that there are no overflows in the computation and the inputs are safe.
- There is no check for this in the code base */
- UBaseType_t upper_bound = portMAX_DELAY - sizeof(Queue_t);
- __CPROVER_assume(uxItemSize < (upper_bound)/uxQueueLength);
+
+ // QueueGenericCreate method does not check for multiplication overflow
+ size_t uxQueueStorageSize;
+ __CPROVER_assume(uxQueueStorageSize < CBMC_OBJECT_MAX_SIZE);
+ __CPROVER_assume(uxItemSize < uxQueueStorageSize/uxQueueLength);
+
QueueHandle_t xQueue =
xQueueGenericCreate(uxQueueLength, uxItemSize, ucQueueType);
if(xQueue){
@@ -83,14 +92,17 @@ QueueHandle_t xUnconstrainedQueue( void ) {
UBaseType_t uxQueueLength;
UBaseType_t uxItemSize;
uint8_t ucQueueType;
+
__CPROVER_assume(uxQueueLength > 0);
- /* The implicit assumption for the QueueGenericCreate method is,
- that there are no overflows in the computation and the inputs are safe.
- There is no check for this in the code base */
- UBaseType_t upper_bound = portMAX_DELAY - sizeof(Queue_t);
- __CPROVER_assume(uxItemSize < (upper_bound)/uxQueueLength);
+
+ // QueueGenericCreate method does not check for multiplication overflow
+ size_t uxQueueStorageSize;
+ __CPROVER_assume(uxQueueStorageSize < CBMC_OBJECT_MAX_SIZE);
+ __CPROVER_assume(uxItemSize < uxQueueStorageSize/uxQueueLength);
+
QueueHandle_t xQueue =
xQueueGenericCreate(uxQueueLength, uxItemSize, ucQueueType);
+
if(xQueue){
xQueue->cTxLock = nondet_int8_t();
xQueue->cRxLock = nondet_int8_t();
|
Remove conditional includes from libtcod.cpp
These are handled in the source files themselves.
|
#include "libtcod/path.cpp"
#include "libtcod/sys.cpp"
#include "libtcod/sys_c.cpp"
-#include "libtcod/txtfield.cpp"
-#include "libtcod/zip.cpp"
-
-#ifndef TCOD_BARE
+#include "libtcod/sys_opengl_c.cpp"
#include "libtcod/sys_sdl_c.cpp"
-#include "libtcod/sys_sdl2_c.cpp"
#include "libtcod/sys_sdl_img_bmp.cpp"
#include "libtcod/sys_sdl_img_png.cpp"
-#ifndef NO_OPENGL
-#include "libtcod/sys_opengl_c.cpp"
-#endif /* NO_OPENGL */
-#endif /* TCOD_BARE */
+#include "libtcod/sys_sdl2_c.cpp"
+#include "libtcod/txtfield.cpp"
+#include "libtcod/zip.cpp"
#include "libtcod/color/canvas.cpp"
#include "libtcod/console/printing.cpp"
|
docs: add version for this user manual
|
### Overview
This article introduces the functions and usage of BoAT IoT Framework SDK 2.x.
The intended readers of this guide are customers who integrate the BoAT IoT Framework SDK.
+The user manual version is 1.0.0.
### Abbreviated Terms
|Term |Explanation |
|
forgot to store status flag in ESSIDLIST
|
@@ -2509,6 +2509,7 @@ for(c = 0; c < apstaessidcount; c++)
{
if((zeiger1->essidlen != zeiger2->essidlen) && (memcmp(zeiger1->mac_ap, zeiger2->mac_ap, 6) != 0) && (memcmp(zeiger1->mac_sta, zeiger2->mac_sta, 6) != 0) && (memcmp(zeiger1->essid, zeiger2->essid, zeiger1->essidlen) != 0))
{
+ zeiger2->status |= zeiger1->status;
memcpy(zeiger2->mac_ap, zeiger1->mac_ap, 6);
memcpy(zeiger2->mac_sta, zeiger1->mac_sta, 6);
zeiger2->essidlen = zeiger1->essidlen;
|
Fix known but not problematic buffer access violation
This is needed to make regression tests pass with
CPPFLAGS=-DMPROTECT_BUFFERS.
|
@@ -791,8 +791,17 @@ fsm_vacuum_page(Relation rel, FSMAddress addr, bool *eof_p)
* pages, increasing the chances that a later vacuum can truncate the
* relation.
*/
+#ifdef MPROTECT_BUFFERS
+ /*
+ * When mprotect() is used to detect shared buffer access violations, lock
+ * must be acquired so that write access is allowed on this buffer.
+ */
+ LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
+#endif
((FSMPage) PageGetContents(page))->fp_next_slot = 0;
-
+#ifdef MPROTECT_BUFFERS
+ LockBuffer(buf, BUFFER_LOCK_UNLOCK);
+#endif
ReleaseBuffer(buf);
return max_avail;
|
test: Change init condition for test_polarity_cc1_default
BRANCH=none
TEST=Run usb_typec_drp_acc_trysrc host test
|
@@ -162,6 +162,14 @@ __maybe_unused static int test_polarity_cc1_default(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_RP_DEF;
mock_tcpc.cc2 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.vbus_level = 1;
+
+ /*
+ * In this test we are expecting value of polarity, which is set by
+ * default for tcpc mock. Initialize it with something else, in order
+ * to catch possible errors.
+ */
+ mock_tcpc.last.polarity = POLARITY_COUNT;
+
task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
/* Before tCCDebounce elapses, we should SRC */
|
Don't add -lrt flag on macos
|
@@ -34,7 +34,7 @@ BINDIR=$(PREFIX)/bin
#CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -fpic -g
CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -fpic -O2 -fvisibility=hidden
-CLIBS=-lm -ldl -lrt
+CLIBS=-lm -ldl
JANET_TARGET=janet
JANET_LIBRARY=libjanet.so
DEBUGGER=gdb
@@ -46,6 +46,7 @@ ifeq ($(UNAME), Darwin)
LDCONFIG:=
else
CFLAGS:=$(CFLAGS) -rdynamic
+ CLIBS:=$(CLIBS) -lrt
endif
# Source headers
|
Fix clang-format fallback check
`[ -z "${CLANG_FORMAT+x}" ]` checks if CLANG_FORMAT is unset, but the
variable will be set even if `which` fails, so we have to check if it is
empty instead.
|
RECOMMENDED_CLANG_FORMAT_MAJOR="11"
CLANG_FORMAT=`which clang-format-$RECOMMENDED_CLANG_FORMAT_MAJOR 2>/dev/null`
-if [ -z "${CLANG_FORMAT+x}" ]; then
+if [ -z "$CLANG_FORMAT" ]; then
CLANG_FORMAT=`which clang-format 2>/dev/null`
fi
|
Update CHANGELOG.md for test changes and Ethernet support in PIC32MZEF
TLS test updates.
Support for Ethernet connectivity was added back to Microchip PIC32MZEF.
|
### Updates
#### Demo specific stack size and priority
- Make stack size and priority to be demo specific. In current release all demos have same stack size and priority. This change will make stack size and priority configurable for each demo. Demo can use default stack size/ priority or define its own.
+#### Ethernet for Microchip Curiosity PIC32MZEF
+- Update Microchip Curiosity PIC32MZEF project and configuration files to support Ethernet connectivty. Developers must define PIC32_USE_ETHERNET at the project level to use Ethernet instead of Wi-Fi.
+
+### Test Updates
+- Remove elliptic curve tests from "quarantine" test group and add them back to the TLS test group.
## 201906.00 Major 06/17/2019
### Release Versioning
|
Fixed uninitialized var.
|
@@ -1573,7 +1573,7 @@ celix_status_t fw_addBundleListener(framework_pt framework, bundle_pt bundle, bu
celix_status_t fw_removeBundleListener(framework_pt framework, bundle_pt bundle, bundle_listener_pt listener) {
celix_status_t status = CELIX_SUCCESS;
- fw_bundle_listener_pt bundleListener;
+ fw_bundle_listener_pt bundleListener = NULL;
celixThreadMutex_lock(&framework->bundleListenerLock);
for (int i = 0; i < arrayList_size(framework->bundleListeners); i++) {
|
kdb: avoid raw pointers in factory
|
class Instancer
{
public:
- virtual Command * get () = 0;
+ virtual std::unique_ptr<Command> get () = 0;
virtual ~Instancer ()
{
}
@@ -68,15 +68,15 @@ public:
template <class T>
class Cnstancer : public Instancer
{
- virtual T * get () override
+ virtual std::unique_ptr<Command> get () override
{
- return new T ();
+ return std::unique_ptr<Command> (new T ());
}
};
class Factory
{
- std::map<std::string, Instancer *> m_factory;
+ std::map<std::string, std::shared_ptr<Instancer>> m_factory;
public:
Factory () : m_factory ()
@@ -120,14 +120,6 @@ public:
m_factory.insert (std::make_pair ("list-commands", new Cnstancer<ListCommandsCommand> ()));
}
- ~Factory ()
- {
- for (auto & elem : m_factory)
- {
- delete elem.second;
- }
- }
-
std::vector<std::string> getPrettyCommands () const
{
std::vector<std::string> ret;
@@ -137,9 +129,8 @@ public:
text += elem.first;
text += getStdColor (ANSI_COLOR::RESET);
text += "\t";
- Command * cmd = elem.second->get ();
+ CommandPtr cmd = elem.second->get ();
text += cmd->getShortHelpText ();
- delete cmd;
ret.push_back (text);
}
ret.push_back (getStdColor (ANSI_COLOR::BOLD) + "help" + getStdColor (ANSI_COLOR::RESET) + "\t" +
@@ -164,7 +155,7 @@ public:
CommandPtr get (std::string const & which)
{
- Instancer * instancer = m_factory[which];
+ std::shared_ptr<Instancer> instancer = m_factory[which];
if (instancer)
{
CommandPtr ret (instancer->get ());
|
fix crash on V0.2 direction detection
|
@@ -399,6 +399,7 @@ ACVP_RESULT acvp_aes_kat_handler(ACVP_CTX *ctx, JSON_Object *obj)
/*
* verify the direction is valid - 0.2 version only
*/
+ if (dir_str != NULL) {
if (!strncmp(dir_str, "encrypt", 7)) {
dir = ACVP_DIR_ENCRYPT;
} else if (!strncmp(dir_str, "decrypt", 7)) {
@@ -407,7 +408,7 @@ ACVP_RESULT acvp_aes_kat_handler(ACVP_CTX *ctx, JSON_Object *obj)
acvp_log_msg(ctx, "ERROR: unsupported direction requested from server (%s)", dir_str);
//return (ACVP_UNSUPPORTED_OP);
}
-
+ }
/*
* Get a reference to the abstracted test case
*/
|
use DN for pattern cells when exporting to C
|
@@ -3,6 +3,8 @@ import { DutyInstrument, NoiseInstrument, WaveInstrument } from "../../../store/
import { PatternCell } from "./song/PatternCell";
import { Song } from "./song/Song";
+const noteConsts = ["C_3","Cs3","D_3","Ds3","E_3","F_3","Fs3","G_3","Gs3","A_3","As3","B_3","C_4","Cs4","D_4","Ds4","E_4","F_4","Fs4","G_4","Gs4","A_4","As4","B_4","C_5","Cs5","D_5","Ds5","E_5","F_5","Fs5","G_5","Gs5","A_5","As5","B_5","C_6","Cs6","D_6","Ds6","E_6","F_6","Fs6","G_6","Gs6","A_6","As6","B_6","C_7","Cs7","D_7","Ds7","E_7","F_7","Fs7","G_7","Gs7","A_7","As7","B_7","C_8","Cs8","D_8","Ds8","E_8","F_8","Fs8","G_8","Gs8","A_8","As8","B_8"];
+
interface InstrumentMap {
[index: number]: number
}
@@ -419,8 +421,8 @@ const patternEqual = function (a: PatternCell[], b: PatternCell[]) {
}
export const exportToC = (song: Song, trackName: string): string => {
- const decHex = (n: number) => {
- return "0x" + n.toString(16).toUpperCase().padStart(2, "0");
+ const decHex = (n: number, maxLength = 2) => {
+ return "0x" + n.toString(16).toUpperCase().padStart(maxLength, "0");
};
const findPattern = function (pattern: PatternCell[]) {
@@ -436,7 +438,7 @@ export const exportToC = (song: Song, trackName: string): string => {
}
const formatPatternCell = function (cell: PatternCell) {
- const note = (cell.note !== null ? cell.note : "___");
+ const note = (cell.note !== null ? noteConsts[cell.note] : "___");
let instrument = 0;
let effect_code = 0;
let effect_param = 0;
@@ -446,7 +448,7 @@ export const exportToC = (song: Song, trackName: string): string => {
effect_code = cell.effectcode;
effect_param = cell.effectparam || 0;
}
- return `${note}, ${decHex((instrument << 4) | effect_code)}, ${decHex(effect_param)}`;
+ return `DN(${note}, ${instrument}, ${decHex((effect_code << 8) | effect_param, 3)})`;
}
const formatDutyInstrument = function (instr: DutyInstrument) {
|
BugID:21838817: remove the ulocation global inlude and code style
|
@@ -33,6 +33,15 @@ typedef union {
} coordinate;
} location_t;
+#ifdef QXWZ_ENABLED
+typedef struct ulocation_qxwz_usr_config {
+ char *appkey;
+ char *appsecret;
+ char *device_ID;
+ char *device_Type;
+} ulocation_qxwz_usr_config_t;
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -90,10 +99,17 @@ int ulocation_update_locationinfo(location_t **gps, char **mmac, char **macs, /*
char **cdma, char **bts, char **nearbts);
/**
- * uloc_update_gpsinfo
+ * ulocation_update_gpsinfo
*/
int ulocation_update_gpsinfo(location_t *lo);
+#ifdef QXWZ_ENABLED
+/**
+ * ulocation_qxwz_service
+ */
+int ulocation_qianxun_service(ulocation_qxwz_usr_config_t *usr_config);
+#endif
+
#ifdef __cplusplus
}
#endif
|
Fix issue with throwing uncaught errors.
|
@@ -56,8 +56,10 @@ int gst_start(Gst *vm) {
frame.size * sizeof(GstValue));
}
stack -= frame.prevSize + GST_FRAME_SIZE;
- if (stack <= thread.data)
+ if (stack <= thread.data) {
+ thread.count = 0;
break;
+ }
frame = *((GstStackFrame *)(stack - GST_FRAME_SIZE));
}
if (thread.count < GST_FRAME_SIZE)
|
BugID:17868639:modified canopen callback func
|
#include "hal_can_stm32f4.h"
#include "hal_timer_stm32f4.h"
+#ifdef AOS_CANOPEN
+#include "co_adapter.h"
+#endif
+
#if defined (__CC_ARM) && defined(__MICROLIB)
#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
#define GETCHAR_PROTOTYPE int fgetc(FILE *f)
@@ -53,7 +57,9 @@ gpio_dev_t brd_gpio_table[] =
CAN_MAPPING CAN_MAPPING_TABLE[] =
{
- { PORT_CAN_CANOPEN, CAN1, NULL, NULL, NULL},
+#ifdef AOS_CANOPEN
+ { PORT_CAN_CANOPEN, CAN1, can_dispatch, NULL, NULL},
+#endif
};
TIMER_MAPPING TIMER_MAPPING_TABLE[] =
|
fix strange issue
|
@@ -257,7 +257,9 @@ free_browsers_hash (void) {
}
if (conf.browsers_file) {
free (conf.user_browsers_hash);
- }Yandex
+ }
+}
+
static int
is_dup (char ***list, int len, const char *browser) {
int i;
@@ -279,7 +281,7 @@ set_browser (char ***list, int idx, const char *browser, const char *type) {
list[idx][0] = xstrdup (browser);
list[idx][1] = xstrdup (type);
}
-Yandex
+
/* Parse the key/value pair from the browser list file. */
static void
parse_browser_token (char ***list, char *line, int n) {
|
slight image update
|
@@ -3,38 +3,36 @@ LABEL maintainer "asv13@pitt.edu"
RUN apt-get update && apt-get upgrade -y
RUN apt-get install -y git make g++ gcc wget swig libtool autoconf
-RUN pip install numpy ipython[all]
+RUN pip install numpy ipython[all] scipy matplotlib
ENV GSL_TAR="gsl-2.3.tar.gz"
ENV GSL_DL="http://ftp.wayne.edu/gnu/gsl/$GSL_TAR"
ENV LD_LIBRARY_PATH=/usr/local/lib
-ENV GITUSER=YOURGITUSERNAME
-ENV GITPASS=YOURGITPASSWORD
+ENV GITUSER=GITUSERNAMEHERE
+ENV GITPASS=GITPASSWORDHERE
WORKDIR /gnu
RUN wget -q $GSL_DL \
&& tar zxvf $GSL_TAR \
- && rm -f $GSL_TAR
-
-WORKDIR /gnu/gsl-2.3
-
-RUN ./configure \
+ && rm -f $GSL_TAR \
+ && cd /gnu/gsl-2.3 \
+ && ./configure \
&& make -j 4 \
&& make install
-WORKDIR /home
-RUN git clone https://$GITUSER:$GITPASS@github.com/LSSTDESC/CCL.git
-
-WORKDIR /home/CCL
-
-RUN ./configure \
+RUN cd /home \
+ && git clone https://$GITUSER:$GITPASS@github.com/LSSTDESC/CCL.git \
+ && cd /home/CCL \
+ && ./configure \
&& make \
&& make install \
&& autoreconf -i \
&& python setup.py install \
&& python setup.py install
+WORKDIR /home/CCL
+
CMD jupyter notebook --no-browser --allow-root --port=8888 --ip=0.0.0.0
|
Updated README.md Docker section (config file).
|
@@ -246,7 +246,7 @@ If you want to expose goaccess on a different port on the host machine, you
ws-url ws://example.com:8080
-or for secured connections:
+or for secured connections, please ensure your configuration file has:
ws-url wss://example.com:8080
|
iOS: remove restricted API usage - fix AppStore submit issue
|
//#define HAVE_WORKING_FORK 1
//RHO
-#define HAVE___SYSCALL 1
+//RHO by Apple's require for AppStore submit
+//#define HAVE___SYSCALL 1
+//RHO
+
#define HAVE__LONGJMP 1
#define HAVE_ATAN2L 1
#define HAVE_ATAN2F 1
#define UCONTEXT_IN_SIGNAL_H 1
#define DEFINE_MCONTEXT_PTR(mc, uc) mcontext_t mc = (uc)->uc_mcontext
-#define HAVE_GETCONTEXT 1
-#define HAVE_SETCONTEXT 1
+
+//RHO by Apple's require for AppStore submit
+//#define HAVE_GETCONTEXT 1
+//#define HAVE_SETCONTEXT 1
+//RHO
+
+
#define HAVE_BACKTRACE 1
#define DLEXT_MAXLEN 3
#define DLEXT ".so"
|
[libdl] fix formatting issue
|
@@ -86,8 +86,8 @@ typedef struct elfhdr
header string table" entry offset */
} Elf32_Ehdr;
-
-typedef struct elf64_hdr {
+typedef struct elf64_hdr
+{
unsigned char e_ident[EI_NIDENT]; /* ELF Identification */
Elf64_Half e_type; /* object file type */
Elf64_Half e_machine; /* machine */
@@ -135,7 +135,6 @@ typedef struct
Elf64_Xword sh_entsize; /* Entry size if section holds table */
} Elf64_Shdr;
-
/* Section names */
#define ELF_BSS ".bss" /* uninitialized data */
#define ELF_DATA ".data" /* initialized data */
@@ -171,7 +170,6 @@ typedef struct elf32_sym
Elf32_Half st_shndx; /* section header index */
} Elf32_Sym;
-
typedef struct
{
Elf64_Word st_name; /* Symbol name (string tbl index) */
@@ -182,8 +180,6 @@ typedef struct
Elf64_Xword st_size; /* Symbol size */
} Elf64_Sym;
-
-
#define STB_LOCAL 0 /* BIND */
#define STB_GLOBAL 1
#define STB_WEAK 2
@@ -244,8 +240,6 @@ typedef struct
#define ELF32_R_TYPE(i) ((unsigned char) (i))
#define ELF32_R_INFO(s,t) (((s) << 8) + (unsigned char)(t))
-
-
#define ELF64_R_SYM(i) ((i) >> 32)
#define ELF64_R_TYPE(i) ((i) & 0xffffffff)
#define ELF64_R_INFO(sym,type) ((((Elf64_Xword) (sym)) << 32) + (type))
@@ -296,7 +290,6 @@ typedef struct
Elf32_Word p_align; /* memory alignment */
} Elf32_Phdr;
-
typedef struct
{
Elf64_Word p_type; /* Segment type */
@@ -309,10 +302,6 @@ typedef struct
Elf64_Xword p_align; /* Segment alignment */
} Elf64_Phdr;
-
-
-
-
/* p_type */
#define PT_NULL 0
#define PT_LOAD 1
@@ -384,10 +373,9 @@ typedef Elf64_Sym Elf_Sym;
typedef Elf64_Rela Elf_Rel;
typedef Elf64_Addr Elf_Addr;
#endif
+
int dlmodule_relocate(struct rt_dlmodule *module, Elf_Rel *rel, Elf_Addr sym_val);
rt_err_t dlmodule_load_shared_object(struct rt_dlmodule *module, void *module_ptr);
rt_err_t dlmodule_load_relocated_object(struct rt_dlmodule *module, void *module_ptr);
-
-
#endif
|
updating README for pipeline changes
|
-**Concourse Pipeline** [](https://gpdb.data.pivotal.ci/teams/gpdb) |
+**Concourse Pipeline** [](https://prod.ci.gpdb.pivotal.io/teams/main/pipelines/gpdb_master) |
**Travis Build** [](https://travis-ci.org/greenplum-db/gpdb)
----------------------------------------------------------------------
|
h7: fix hal_tick
|
@@ -42,6 +42,11 @@ void SysTick_Handler() {
systick_val = SysTick->VAL;
systick_pending = 0;
(void)(SysTick->CTRL);
+
+#ifdef USE_HAL_DRIVER
+ // used by the HAL for some timekeeping and timeouts, should always be 1ms
+ HAL_IncTick();
+#endif
}
uint32_t time_micros_isr() {
|
hwdocs: Start XF docs.
|
@@ -20,3 +20,4 @@ Contents:
fermi/index
kepler/index
maxwell/index
+ xf
|
add eval folder to mk_wheel.py
|
@@ -185,6 +185,7 @@ def build(arc_root, out_root, tail_args):
shutil.copy('core.py', 'catboost/catboost/core.py')
shutil.copy('datasets.py', 'catboost/catboost/datasets.py')
shutil.copy('utils.py', 'catboost/catboost/utils.py')
+ shutil.copytree('eval', 'catboost/catboost/eval')
shutil.copytree('widget', 'catboost/catboost/widget')
dist_info_dir = 'catboost/catboost-{}.dist-info'.format(ver)
shutil.copytree(os.path.join(py_trait.arc_root, 'catboost', 'python-package', 'catboost.dist-info'), dist_info_dir)
|
Fix memory leaks in conf_def.c
Fixes
CLA: trivial
|
@@ -442,11 +442,13 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
if (biosk == NULL) {
if ((biosk = sk_BIO_new_null()) == NULL) {
CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE);
+ BIO_free(next);
goto err;
}
}
if (!sk_BIO_push(biosk, in)) {
CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE);
+ BIO_free(next);
goto err;
}
/* continue with reading from the included BIO */
|
Hold the flag_lock when calling child callbacks
Not holding the flag lock when creating/removing child providers can
confuse the activation counts if the parent provider is loaded/unloaded
at the same time.
|
* some other function while holding a lock make sure you know whether it
* will make any upcalls or not. For example ossl_provider_up_ref() can call
* ossl_provider_up_ref_parent() which can call the c_prov_up_ref() upcall.
- * - It is permissible to hold the store lock when calling child provider
- * callbacks. No other locks may be held during such callbacks.
+ * - It is permissible to hold the store and flag locks when calling child
+ * provider callbacks. No other locks may be held during such callbacks.
*/
static OSSL_PROVIDER *provider_new(const char *name,
@@ -1058,9 +1058,6 @@ static int provider_deactivate(OSSL_PROVIDER *prov, int upcalls,
removechildren = 0;
#endif
- if (lock)
- CRYPTO_THREAD_unlock(prov->flag_lock);
-
#ifndef FIPS_MODULE
if (removechildren && store != NULL) {
int i, max = sk_OSSL_PROVIDER_CHILD_CB_num(store->child_cbs);
@@ -1072,8 +1069,10 @@ static int provider_deactivate(OSSL_PROVIDER *prov, int upcalls,
}
}
#endif
- if (lock)
+ if (lock) {
+ CRYPTO_THREAD_unlock(prov->flag_lock);
CRYPTO_THREAD_unlock(store->lock);
+ }
#ifndef FIPS_MODULE
if (freeparent)
ossl_provider_free_parent(prov, 1);
@@ -1091,7 +1090,7 @@ static int provider_activate(OSSL_PROVIDER *prov, int lock, int upcalls)
{
int count = -1;
struct provider_store_st *store;
- int ret = 1, createchildren = 0;
+ int ret = 1;
store = prov->store;
/*
@@ -1129,15 +1128,13 @@ static int provider_activate(OSSL_PROVIDER *prov, int lock, int upcalls)
count = ++prov->activatecnt;
prov->flag_activated = 1;
- if (prov->activatecnt == 1 && store != NULL)
- createchildren = 1;
-
- if (lock)
- CRYPTO_THREAD_unlock(prov->flag_lock);
- if (createchildren)
+ if (prov->activatecnt == 1 && store != NULL) {
ret = create_provider_children(prov);
- if (lock)
+ }
+ if (lock) {
+ CRYPTO_THREAD_unlock(prov->flag_lock);
CRYPTO_THREAD_unlock(store->lock);
+ }
if (!ret)
return -1;
|
rpi-config: Handle ARMSTUB
|
@@ -191,6 +191,17 @@ do_deploy() {
# Append extra config if the user has provided any
printf "${RPI_EXTRA_CONFIG}\n" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+
+ # Handle setup with armstub file
+ if [ -n "${ARMSTUB}" ]; then
+ echo "\n# ARM stub configuration" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+ echo "armstub=${ARMSTUB}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+ case "${ARMSTUB}" in
+ *-gic.bin)
+ echo "enable_gic=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+ ;;
+ esac
+ fi
}
do_deploy_append_raspberrypi3-64() {
|
Inline window events handling
Now that all screen-related events are handled from screen.c, there is
no need for a separate method for window events.
|
@@ -541,34 +541,6 @@ screen_resize_to_pixel_perfect(struct screen *screen) {
content_size.height);
}
-static void
-screen_handle_window_event(struct screen *screen,
- const SDL_WindowEvent *event) {
- switch (event->event) {
- case SDL_WINDOWEVENT_EXPOSED:
- screen_render(screen, true);
- break;
- case SDL_WINDOWEVENT_SIZE_CHANGED:
- screen_render(screen, true);
- break;
- case SDL_WINDOWEVENT_MAXIMIZED:
- screen->maximized = true;
- break;
- case SDL_WINDOWEVENT_RESTORED:
- if (screen->fullscreen) {
- // On Windows, in maximized+fullscreen, disabling fullscreen
- // mode unexpectedly triggers the "restored" then "maximized"
- // events, leaving the window in a weird state (maximized
- // according to the events, but not maximized visually).
- break;
- }
- screen->maximized = false;
- apply_pending_resize(screen);
- break;
- }
-}
-
-
bool
screen_handle_event(struct screen *screen, SDL_Event *event) {
switch (event->type) {
@@ -588,7 +560,29 @@ screen_handle_event(struct screen *screen, SDL_Event *event) {
// Do nothing
return true;
}
- screen_handle_window_event(screen, &event->window);
+ switch (event->window.event) {
+ case SDL_WINDOWEVENT_EXPOSED:
+ screen_render(screen, true);
+ break;
+ case SDL_WINDOWEVENT_SIZE_CHANGED:
+ screen_render(screen, true);
+ break;
+ case SDL_WINDOWEVENT_MAXIMIZED:
+ screen->maximized = true;
+ break;
+ case SDL_WINDOWEVENT_RESTORED:
+ if (screen->fullscreen) {
+ // On Windows, in maximized+fullscreen, disabling
+ // fullscreen mode unexpectedly triggers the "restored"
+ // then "maximized" events, leaving the window in a
+ // weird state (maximized according to the events, but
+ // not maximized visually).
+ break;
+ }
+ screen->maximized = false;
+ apply_pending_resize(screen);
+ break;
+ }
return true;
}
|
Detect RISC-V ISA extensions
|
# elif defined(__xtensa__)
# define M3_ARCH "xtensa"
# elif defined(__riscv)
-# define M3_ARCH "riscv"
+# if defined(__riscv_32e)
+# define _M3_ARCH_RV "rv32e"
+# elif __riscv_xlen == 128
+# define _M3_ARCH_RV "rv128i"
+# elif __riscv_xlen == 64
+# define _M3_ARCH_RV "rv64i"
+# elif __riscv_xlen == 32
+# define _M3_ARCH_RV "rv32i"
+# endif
+# if defined(__riscv_muldiv)
+# define _M3_ARCH_RV_M _M3_ARCH_RV "m"
+# else
+# define _M3_ARCH_RV_M _M3_ARCH_RV
+# endif
+# if defined(__riscv_atomic)
+# define _M3_ARCH_RV_A _M3_ARCH_RV_M "a"
+# else
+# define _M3_ARCH_RV_A _M3_ARCH_RV_M
+# endif
+# if defined(__riscv_flen)
+# define _M3_ARCH_RV_F _M3_ARCH_RV_A "f"
+# else
+# define _M3_ARCH_RV_F _M3_ARCH_RV_A
+# endif
+# if defined(__riscv_flen) && __riscv_flen >= 64
+# define _M3_ARCH_RV_D _M3_ARCH_RV_F "d"
+# else
+# define _M3_ARCH_RV_D _M3_ARCH_RV_F
+# endif
+# if defined(__riscv_compressed)
+# define _M3_ARCH_RV_C _M3_ARCH_RV_D "c"
+# else
+# define _M3_ARCH_RV_C _M3_ARCH_RV_D
+# endif
+# define M3_ARCH _M3_ARCH_RV_C
# elif defined(__AVR__)
# define M3_ARCH "avr"
# endif
|
fix to controls_if_elseif maybe be aborted during merge
|
@@ -406,7 +406,7 @@ Blockly.Blocks['controls_if'] = {
// Rebuild block.
for (var i = 1; i <= this.elseifCount_; i++) {
this.appendValueInput('IF' + i)
- .setCheck('Boolean')
+ .setCheck([Number,Boolean])
.appendField(Blockly.Msg['CONTROLS_IF_MSG_ELSEIF']);
this.appendStatementInput('DO' + i)
.appendField(Blockly.Msg['CONTROLS_IF_MSG_THEN']);
|
Default errhand implementation handles restart event;
|
@@ -233,7 +233,10 @@ function lovr.errhand(message, traceback)
return function()
lovr.event.pump()
- for name, a in lovr.event.poll() do if name == 'quit' then return a or 1 end end
+ for name, a in lovr.event.poll() do
+ if name == 'quit' then return a or 1
+ elseif name == 'restart' then return 'restart', lovr.restart and lovr.restart() end
+ end
lovr.graphics.origin()
if lovr.headset then
lovr.headset.update(0)
|
HW: Fixing detach action in mmio.vhd
|
@@ -799,7 +799,7 @@ BEGIN
context_stop_q <= (OTHERS => '0');
IF (context_status_mmio_addr = jmm_d_i.context_id) AND (jmm_c_i.status_we = '1') THEN
- context_stop_ack_q0 <= context_stop_ack_q0 AND jmm_d_i.context_active;
+ context_stop_ack_q0 <= context_stop_ack_q0 AND jmm_d_i.attached_to_action;
ELSE
context_stop_ack_q0 <= context_stop_ack_q0;
END IF;
|
Build: Fix warning reported by Clang
Clang does not support the option switch `-Wno-psabi`.
|
include (LibAddMacros)
-if (DEPENDENCY_PHASE)
+if (DEPENDENCY_PHASE AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set_source_files_properties(range.c PROPERTIES COMPILE_FLAGS -Wno-psabi)
endif ()
|
Clean up auth code.
|
// Types...
//
-typedef struct pappl_authdata_s // PAM authentication data
+typedef struct _pappl_authdata_s // PAM authentication data
{
const char *username, // Username string
*password; // Password string
-} pappl_authdata_t;
+} _pappl_authdata_t;
//
@@ -40,7 +40,7 @@ typedef struct pappl_authdata_s // PAM authentication data
static int pappl_authenticate_user(pappl_client_t *client, const char *username, const char *password);
#ifdef HAVE_LIBPAM
-static int pappl_pam_func(int num_msg, const struct pam_message **msg, struct pam_response **resp, pappl_authdata_t *data);
+static int pappl_pam_func(int num_msg, const struct pam_message **msg, struct pam_response **resp, _pappl_authdata_t *data);
#endif // HAVE_LIBPAM
@@ -180,7 +180,7 @@ pappl_authenticate_user(
{
int status = 0; // Return status
#ifdef HAVE_LIBPAM
- pappl_authdata_t data; // Authorization data
+ _pappl_authdata_t data; // Authorization data
pam_handle_t *pamh; // PAM authentication handle
int pamerr; // PAM error code
struct pam_conv pamdata; // PAM conversation data
@@ -246,7 +246,7 @@ pappl_pam_func(
int num_msg, // I - Number of messages
const struct pam_message **msg, // I - Messages
struct pam_response **resp, // O - Responses
- pappl_authdata_t *data) // I - Authentication data
+ _pappl_authdata_t *data) // I - Authentication data
{
int i; // Looping var
struct pam_response *replies; // Replies
|
Clarify IFA_LOCAL code in kernel_netlink.
|
@@ -1334,13 +1334,16 @@ parse_addr_rta(struct ifaddrmsg *addr, int len, struct in6_addr *res)
struct rtattr *rta;
len -= NLMSG_ALIGN(sizeof(*addr));
rta = IFA_RTA(addr);
- int has_local = 0; /* A _LOCAL TLV may be bound with a _ADDRESS' which
- represents the peer's address. In this case, ignore _ADDRESS. */
+ int is_local = 0;
while(RTA_OK(rta, len)) {
switch(rta->rta_type) {
case IFA_LOCAL:
- has_local = 1;
+ /* On some point-to-point technologies, there's both _LOCAL
+ and _ADDRESS, and _ADDRESS is apparently the peer address
+ while _LOCAL is the one we want. */
+ is_local = 1;
+ /* fallthrough */
case IFA_ADDRESS:
switch(addr->ifa_family) {
case AF_INET:
@@ -1357,7 +1360,7 @@ parse_addr_rta(struct ifaddrmsg *addr, int len, struct in6_addr *res)
return -1;
break;
}
- if(has_local)
+ if(is_local)
return 0;
break;
default:
|
Remove debug info and hacks
|
@@ -637,15 +637,13 @@ PrelinkedInjectKext (
return Status;
}
- if (XmlNodePrepend (Context->KextList, "dict", NULL, NewInfoPlist) == NULL) {
+ if (XmlNodeAppend (Context->KextList, "dict", NULL, NewInfoPlist) == NULL) {
if (PrelinkedKext != NULL) {
InternalFreePrelinkedKext (PrelinkedKext);
}
return EFI_OUT_OF_RESOURCES;
}
- DEBUG ((DEBUG_WARN, "Result %u\n", XmlNodeChildren (Context->KextList)));
-
//
// Let other kexts depend on this one.
//
|
board/hammer/board.h: Format with clang-format
BRANCH=none
TEST=none
Tricium: disable
|
#undef CONFIG_USB_I2C_MAX_WRITE_COUNT
#ifdef VARIANT_HAMMER_TP_LARGE_PAGE
/* Zed requires 516 byte per packet for touchpad update */
-#define CONFIG_USB_I2C_MAX_WRITE_COUNT (1024 - 4) /* 4 is maximum header size \
+#define CONFIG_USB_I2C_MAX_WRITE_COUNT \
+ (1024 - 4) /* 4 is maximum header size \
*/
#else
-#define CONFIG_USB_I2C_MAX_WRITE_COUNT (128 - 4) /* 4 is maximum header size \
+#define CONFIG_USB_I2C_MAX_WRITE_COUNT \
+ (128 - 4) /* 4 is maximum header size \
*/
#endif
#undef CONFIG_USB_I2C_MAX_READ_COUNT
-#define CONFIG_USB_I2C_MAX_READ_COUNT (1024 - 6) /* 6 is maximum header size \
+#define CONFIG_USB_I2C_MAX_READ_COUNT \
+ (1024 - 6) /* 6 is maximum header size \
*/
#define CONFIG_I2C_XFER_LARGE_TRANSFER
|
Include vulkan.h before #define VMA_VULKAN_VERSION
|
@@ -126,6 +126,10 @@ for user-defined purpose without allocating any real GPU memory.
extern "C" {
#endif
+#ifndef VULKAN_H_
+ #include <vulkan/vulkan.h>
+#endif
+
// Define this macro to declare maximum supported Vulkan version in format AAABBBCCC,
// where AAA = major, BBB = minor, CCC = patch.
// If you want to use version > 1.0, it still needs to be enabled via VmaAllocatorCreateInfo::vulkanApiVersion.
@@ -170,10 +174,6 @@ extern "C" {
#endif // #if VMA_VULKAN_VERSION >= 1001000
#endif // #if defined(__ANDROID__) && VMA_STATIC_VULKAN_FUNCTIONS && VK_NO_PROTOTYPES
-#ifndef VULKAN_H_
- #include <vulkan/vulkan.h>
-#endif
-
#if !defined(VK_VERSION_1_2)
// This one is tricky. Vulkan specification defines this code as available since
// Vulkan 1.0, but doesn't actually define it in Vulkan SDK earlier than 1.2.131.
|
IPv4 layer ignores packets intended for other hosts
|
@@ -31,6 +31,14 @@ bool ip_equals__buf_u32(const uint8_t ip_buf[IPv4_ADDR_SIZE], uint32_t ip2) {
}
void ipv4_receive(packet_info_t* packet_info, ipv4_packet_t* packet, uint32_t packet_size) {
+ // Ignore packets intended for other hosts
+ uint8_t ipv4[IPv4_ADDR_SIZE];
+ net_copy_local_ipv4_addr(ipv4);
+ if (memcmp(&packet->dest_ip, ipv4, IPv4_ADDR_SIZE)) {
+ free(packet);
+ return;
+ }
+
// Fill in the IPv4 specific packet info
memcpy(packet_info->src_ipv4, &packet->source_ip, IPv4_ADDR_SIZE);
memcpy(packet_info->dst_ipv4, &packet->dest_ip, IPv4_ADDR_SIZE);
|
Use struct/union initialization syntax for SDL events in xterm code.
|
@@ -220,21 +220,29 @@ static void *xterm_handle_input(void *arg) {
sym = tolower(sym);
mod = KMOD_SHIFT;
}
- SDL_Event down_event;
- down_event.type = SDL_KEYDOWN;
- down_event.key.timestamp = SDL_GetTicks();
- down_event.key.windowID = 0;
- down_event.key.state = SDL_PRESSED;
- down_event.key.repeat = 0;
- down_event.key.keysym.sym = sym;
- down_event.key.keysym.scancode = SDL_GetScancodeFromKey(sym);
- down_event.key.keysym.mod = mod;
- SDL_Event text_event;
- text_event.type = SDL_TEXTINPUT;
- text_event.text.timestamp = SDL_GetTicks();
- text_event.text.windowID = 0;
- text_event.text.text[0] = ch;
- text_event.text.text[1] = '\0';
+ SDL_Event down_event = {
+ .key = {
+ .type = SDL_KEYDOWN,
+ .timestamp = SDL_GetTicks(),
+ .windowID = 0,
+ .state = SDL_PRESSED,
+ .repeat = 0,
+ .keysym = {
+ .sym = sym,
+ .scancode = SDL_GetScancodeFromKey(sym),
+ .mod = mod
+ }
+ }
+ };
+ SDL_Event text_event = {
+ .text = {
+ .type = SDL_TEXTINPUT,
+ .timestamp = SDL_GetTicks(),
+ .windowID = 0,
+ .text[0] = ch,
+ .text[1] = '\0'
+ }
+ };
SDL_Event up_event = down_event;
up_event.type = SDL_KEYUP;
up_event.key.state = SDL_RELEASED;
@@ -269,22 +277,28 @@ static TCOD_Error xterm_recommended_console_size(
static void xterm_on_window_change_signal(int signum) {
int columns, rows;
xterm_recommended_console_size(NULL, 1.0, &columns, &rows);
- SDL_Event resize_event;
- resize_event.type = SDL_WINDOWEVENT;
- resize_event.window.event = SDL_WINDOWEVENT_RESIZED;
- resize_event.window.timestamp = SDL_GetTicks();
- resize_event.window.windowID = 0;
- resize_event.window.data1 = columns;
- resize_event.window.data2 = rows;
+ SDL_Event resize_event = {
+ .window = {
+ .type = SDL_WINDOWEVENT,
+ .event = SDL_WINDOWEVENT_RESIZED,
+ .timestamp = SDL_GetTicks(),
+ .windowID = 0,
+ .data1 = columns,
+ .data2 = rows,
+ }
+ };
SDL_PushEvent(&resize_event);
}
#endif
#ifndef _WIN32
static void xterm_on_hangup_signal(int signum) {
- SDL_Event quit_event;
- quit_event.type = SDL_QUIT;
- quit_event.quit.timestamp = SDL_GetTicks();
+ SDL_Event quit_event = {
+ .quit = {
+ .type = SDL_QUIT,
+ .timestamp = SDL_GetTicks(),
+ }
+ };
SDL_PushEvent(&quit_event);
}
#endif
|
docs: Add "sidebarCollapsible: false"
|
@@ -7,6 +7,7 @@ module.exports = {
organizationName: "zmkfirmware", // Usually your GitHub org/user name.
projectName: "zmk", // Usually your repo name.
themeConfig: {
+ sidebarCollapsible: false,
navbar: {
title: "ZMK Firmware",
logo: {
|
stm32mon: add STM32H7 identifier
Add a new chip ID to support the STM32H7x3 parts.
BRANCH=none
TEST=flash_ec --board=meowth_fp
Commit-Ready: Vincent Palatin
Tested-by: Vincent Palatin
|
@@ -93,6 +93,7 @@ struct stm32_def {
{0x442, "STM32F09x", 0x40000, 2048, {13, 13} },
{0x431, "STM32F411", 0x80000, 16384, {13, 19} },
{0x441, "STM32F412", 0x80000, 16384, {13, 19} },
+ {0x450, "STM32H74x", 0x200000, 131768, {13, 19} },
{0x451, "STM32F76x", 0x200000, 32768, {13, 19} },
{ 0 }
};
|
append alphas at the end
|
@@ -143,6 +143,7 @@ def prepare_circle(beatmap, scale, skin, settings, hd):
# for late tapping
slidercircle_frames[-1].append(orig_slider)
circle_frames[-1].append(orig_circle)
+ alphas.append(alpha)
else:
interval = int(settings.timeframe / settings.fps)
|
DHCP-test: more robust sleep check
|
@@ -360,6 +360,16 @@ class TestDHCP(VppTestCase):
# not sure why this is not decoding
# adv = pkt[DHCP6_Advertise]
+ def wait_for_no_route(self, address, length,
+ n_tries=50, s_time=1):
+ while (n_tries):
+ if not find_route(self, address, length):
+ return True
+ n_tries = n_tries - 1
+ self.sleep(s_time)
+
+ return False
+
def test_dhcp_proxy(self):
""" DHCPv4 Proxy """
@@ -1535,15 +1545,10 @@ class TestDHCP(VppTestCase):
is_add=0)
#
- # Sleep for the lease time
- #
- self.sleep(lease_time+1)
-
+ # the route should be gone after the lease expires
#
- # And now the route should be gone
- #
- self.assertFalse(find_route(self, self.pg3.local_ip4, 32))
- self.assertFalse(find_route(self, self.pg3.local_ip4, 24))
+ self.assertTrue(self.wait_for_no_route(self.pg3.local_ip4, 32))
+ self.assertTrue(self.wait_for_no_route(self.pg3.local_ip4, 24))
#
# remove the DHCP config
|
no reset backpain when in rising or risingattack
|
@@ -22747,7 +22747,6 @@ int set_rise(entity *iRise, int type, int reset)
iRise->falling = 0;
iRise->rising = 1;
iRise->riseattacking = 0;
- iRise->inbackpain = 0;
iRise->projectile = 0;
iRise->nograb = iRise->nograb_default; //iRise->nograb = 0;
iRise->velocity.x = self->velocity.z = self->velocity.y = 0;
@@ -22801,6 +22800,8 @@ int set_riseattack(entity *iRiseattack, int type, int reset)
iRiseattack->takeaction = common_attack_proc;
self->staydown.riseattack_stall = 0; //Reset riseattack delay.
set_attacking(iRiseattack);
+ iRiseattack->inpain = 0;
+ iRiseattack->falling = 0;
iRiseattack->rising = 0;
iRiseattack->riseattacking = 1;
iRiseattack->drop = 0;
|
vere: improves error handling in binary download
|
@@ -992,9 +992,11 @@ _king_save_file(c3_c* url_c, FILE* fil_u)
// XX retry?
//
if ( CURLE_OK != res_i ) {
+ u3l_log("curl: failed %s: %s\n", url_c, curl_easy_strerror(res_i));
ret_i = -1;
}
if ( 300 <= cod_i ) {
+ u3l_log("curl: error %s: HTTP %ld\n", url_c, cod_i);
ret_i = -2;
}
@@ -1112,8 +1114,9 @@ _king_get_vere(c3_c* pac_c, c3_c* ver_c, c3_c* arc_c, c3_t lin_t)
if ( (ret_i = _king_save_file(url_c, fil_u)) ) {
u3l_log("unable to save %s to %s: %d\r\n", url_c, bin_c, ret_i);
c3_free(url_c);
- c3_free(bin_c);
fclose(fil_u);
+ unlink(bin_c);
+ c3_free(bin_c);
return -1; // XX
}
@@ -1121,13 +1124,16 @@ _king_get_vere(c3_c* pac_c, c3_c* ver_c, c3_c* arc_c, c3_t lin_t)
//
if ( fflush(fil_u) || c3_sync(fid_i) ) {
fprintf(stderr, "vere: sync %s failed: %s\n", bin_c, strerror(errno));
- c3_free(bin_c);
+ c3_free(url_c);
fclose(fil_u);
+ unlink(bin_c);
+ c3_free(bin_c);
return -1;
}
fclose(fil_u);
+ // XX if link fails wat do?
// XX set via cli option
//
if ( lin_t ) {
|
Fix startup delay when using show details menu
|
@@ -536,8 +536,6 @@ VOID PhMwpOnDestroy(
{
PhMainWndExiting = TRUE;
- PhSetIntegerSetting(L"MainWindowTabRestoreIndex", TabCtrl_GetCurSel(TabControlHandle));
-
// Notify pages and plugins that we are shutting down.
PhMwpNotifyAllPages(MainTabPageDestroy, NULL, NULL);
@@ -634,7 +632,7 @@ VOID PhMwpOnCommand(
if (PhShellProcessHacker(
WindowHandle,
- L"-v",
+ L"-v -newinstance",
SW_SHOW,
PH_SHELL_EXECUTE_ADMIN,
PH_SHELL_APP_PROPAGATE_PARAMETERS | PH_SHELL_APP_PROPAGATE_PARAMETERS_IGNORE_VISIBILITY,
@@ -1987,6 +1985,7 @@ VOID PhMwpSaveSettings(
PhNfSaveSettings();
PhSetIntegerSetting(L"IconNotifyMask", PhMwpNotifyIconNotifyMask);
+ PhSetIntegerSetting(L"MainWindowTabRestoreIndex", TabCtrl_GetCurSel(TabControlHandle));
PhSaveWindowPlacementToSetting(L"MainWindowPosition", L"MainWindowSize", WindowHandle);
PhMwpSaveWindowState(WindowHandle);
|
Sanity check for input buffer overruns in RLE uncompress
|
@@ -129,6 +129,11 @@ rleUncompress (int inLength, int maxLength, const signed char in[], char out[])
if (0 > (maxLength -= count))
return 0;
+ // check the input buffer is big enough to contain
+ // 'count' bytes of remaining data
+ if (inLength < 0)
+ return 0;
+
memcpy(out, in, count);
out += count;
in += count;
|
Apply over sampling
|
@@ -274,10 +274,25 @@ soundmng_create(UINT rate, UINT bufmsec)
UINT samples;
int i;
- if (opened || ((rate != 11025) && (rate != 22050) && (rate != 44100))) {
+ if (opened) {
+ return 0;
+ }
+ switch(rate) {
+ case 11025:
+ case 22050:
+ case 44100:
+ case 48000:
+ case 88200:
+ case 96000:
+ case 176400:
+ case 192000:
+ break;
+
+ default:
return 0;
}
+
if (bufmsec < 20)
bufmsec = 20;
else if (bufmsec > 1000)
|
tests MAINTENANCE fix test_parser_yin ASAN stack overflow
|
@@ -630,7 +630,7 @@ test_yin_parse_content(void **state)
struct lysp_when *when_p = NULL;
struct lysp_type_enum pos_enum = {}, val_enum = {};
struct lysp_type req_type = {}, range_type = {}, len_type = {}, patter_type = {}, enum_type = {};
- uint8_t config = 0;
+ uint16_t config = 0;
ly_in_new_memory(data, &st->in);
lyxml_ctx_new(st->ctx, st->in, &st->yin_ctx->xmlctx);
|
Spoof disable
|
@@ -337,11 +337,11 @@ namespace MiningCore.Stratum
if (line.StartsWith("PROXY "))
{
- var proxyAddresses = proxyProtocol.ProxyAddresses?.Select(x => IPAddress.Parse(x)).ToArray();
- if (proxyAddresses == null || !proxyAddresses.Any())
- proxyAddresses = new[] { IPAddress.Loopback };
+ //var proxyAddresses = proxyProtocol.ProxyAddresses?.Select(x => IPAddress.Parse(x)).ToArray();
+ //if (proxyAddresses == null || !proxyAddresses.Any())
+ // proxyAddresses = new[] { IPAddress.Loopback };
- if (proxyAddresses.Any(x => x.Equals(peerAddress)))
+ //if (proxyAddresses.Any(x => x.Equals(peerAddress)))
{
logger.Debug(() => $"[{ConnectionId}] Received Proxy-Protocol header: {line}");
@@ -355,10 +355,10 @@ namespace MiningCore.Stratum
logger.Info(() => $"[{ConnectionId}] Real-IP via Proxy-Protocol: {RemoteEndpoint.Address}");
}
- else
- {
- throw new InvalidDataException($"[{ConnectionId}] Received spoofed Proxy-Protocol header from {peerAddress}");
- }
+ //else
+ //{
+ // throw new InvalidDataException($"[{ConnectionId}] Received spoofed Proxy-Protocol header from {peerAddress}");
+ //}
return true;
}
|
hoon: refactors +ro-co:co, modernizing syntax
|
|=({? b/@ c/tape} [(dug b) c])
::
++ ro-co
- |= {{buz/@ bas/@ dop/@} dug/$-(@ @)}
- |= hol/@
+ |= [[buz=@ bas=@ dop=@] dug=$-(@ @)]
+ |= hol=@
^- tape
?: =(0 dop)
rep
- => .(rep $(dop (dec dop)))
:- '.'
- %- (em-co [bas 1] |=({? b/@ c/tape} [(dug b) c]))
- [(cut buz [(dec dop) 1] hol)]
+ =/ pod (dec dop)
+ %. (cut buz [pod 1] hol)
+ %+ em-co(rep $(dop pod))
+ [bas 1]
+ |=([? b=@ c=tape] [(dug b) c])
--
::
:::: 4l: atom parsing
|
Fix sensors/hyt271.c:811:16: error: 'data.data' may be used uninitialized [-Werror=maybe-uninitialized]
|
@@ -782,11 +782,11 @@ static int hyt271_thread(int argc, char** argv)
{
FAR struct hyt271_dev_s *priv = (FAR struct hyt271_dev_s *)
((uintptr_t)strtoul(argv[1], NULL, 0));
+ uint32_t orawdata = 0;
while (true)
{
int ret;
- uint32_t orawdata;
struct hyt271_sensor_data_s data;
struct hyt271_sensor_s *hsensor = &priv->sensor[HYT271_SENSOR_HUMI];
struct hyt271_sensor_s *tsensor = &priv->sensor[HYT271_SENSOR_TEMP];
@@ -806,12 +806,7 @@ static int hyt271_thread(int argc, char** argv)
}
}
- /* Store the last sensor data for later comparison */
-
- orawdata = data.data;
-
ret = hyt271_measure_read(priv, &data);
-
if (!ret)
{
/* Notify upper */
@@ -838,6 +833,10 @@ static int hyt271_thread(int argc, char** argv)
{
priv->initial_read = true;
}
+
+ /* Store the last sensor data for later comparison */
+
+ orawdata = data.data;
}
/* Sleeping thread before fetching the next sensor data */
|
Satisfy review feedback
|
@@ -10,9 +10,11 @@ package com.blockset.walletkit;
import com.blockset.walletkit.errors.WalletConnectorError;
import com.blockset.walletkit.utility.CompletionHandler;
+import com.google.common.base.Preconditions;
import java.util.Map;
+import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
public interface WalletConnector {
@@ -94,8 +96,12 @@ public interface WalletConnector {
this.failure = failure;
}
- public @Nullable Success getSuccess() { return success; }
- public @Nullable Failure getFailure() { return failure; }
+ public @NonNull Success getSuccess() { return Preconditions.checkNotNull(success); }
+ public @NonNull Failure getFailure() { return Preconditions.checkNotNull(failure); }
+
+ public @Nullable Success getSuccessOrNull() { return success; }
+ public @Nullable Failure getFailureOrNull() { return failure; }
+
public boolean isFailure() { return failure != null; }
public boolean isSuccess() { return !isFailure(); }
@@ -158,7 +164,7 @@ public interface WalletConnector {
*/
Result<Key, WalletConnectorError>
recover ( Digest digest,
- Signature signature ) throws WalletConnectorError;
+ Signature signature );
/**
* Create a serialization from a transaction's unsigned or signed data.
|
rpi-cmdline: Leave cma value to kernel default
Fixes where setting cma to a lower value affects the ability of
libcamera-apps to capture higher resolution images.
|
@@ -13,10 +13,6 @@ CMDLINE_ROOTFS ?= "root=/dev/mmcblk0p2 ${CMDLINE_ROOT_FSTYPE} rootwait"
CMDLINE_SERIAL ?= "${@oe.utils.conditional("ENABLE_UART", "1", "console=serial0,115200", "", d)}"
-CMDLINE_CMA ?= "${@oe.utils.conditional("RASPBERRYPI_CAMERA_V2", "1", "cma=64M", "", d)}"
-
-CMDLINE_CMA ?= "${@oe.utils.conditional("RASPBERRYPI_HD_CAMERA", "1", "cma=64M", "", d)}"
-
CMDLINE_PITFT ?= "${@bb.utils.contains("MACHINE_FEATURES", "pitft", "fbcon=map:10 fbcon=font:VGA8x8", "", d)}"
# Add the kernel debugger over console kernel command line option if enabled
|
sysdeps/managarm: Allow retrieval in sys_sigaction()
|
@@ -36,7 +36,6 @@ int sys_sigprocmask(int how, const sigset_t *set, sigset_t *retrieve) {
int sys_sigaction(int number, const struct sigaction *__restrict action,
struct sigaction *__restrict saved_action) {
SignalGuard sguard;
- __ensure(action);
// TODO: Respect restorer. __ensure(!(action->sa_flags & SA_RESTORER));
@@ -45,6 +44,8 @@ int sys_sigaction(int number, const struct sigaction *__restrict action,
managarm::posix::CntRequest<MemoryAllocator> req(getSysdepsAllocator());
req.set_request_type(managarm::posix::CntReqType::SIG_ACTION);
+ if(action) {
+ req.set_mode(1);
req.set_flags(action->sa_flags);
req.set_sig_number(number);
req.set_sig_mask(action->sa_mask);
@@ -54,6 +55,7 @@ int sys_sigaction(int number, const struct sigaction *__restrict action,
req.set_sig_handler(reinterpret_cast<uintptr_t>(action->sa_handler));
}
req.set_sig_restorer(reinterpret_cast<uintptr_t>(&__mlibc_signal_restore));
+ }
frigg::String<MemoryAllocator> ser(getSysdepsAllocator());
req.SerializeToString(&ser);
|
Updated RecvMessage, payload.WireguardStatusUpdate
|
@@ -122,6 +122,9 @@ func (c *extDataplaneConn) RecvMessage() (msg interface{}, err error) {
msg = payload.HostEndpointStatusUpdate
case *proto.FromDataplane_HostEndpointStatusRemove:
msg = payload.HostEndpointStatusRemove
+ case *proto.FromDataplane_WireguardStatusUpdate:
+ msg = payload.WireguardStatusUpdate
+
default:
log.WithField("payload", payload).Warn("Ignoring unknown message from dataplane")
}
|
spi: simplify reconfigure
|
@@ -229,19 +229,22 @@ bool spi_dma_wait_for_ready(spi_ports_t port) {
}
static void spi_reconfigure(spi_bus_device_t *bus) {
- if (spi_port_config[bus->port].mode == bus->mode && spi_port_config[bus->port].hz == bus->hz) {
+ const spi_port_def_t *port = &spi_port_defs[bus->port];
+
+ spi_port_config_t *config = &spi_port_config[bus->port];
+ if (config->mode == bus->mode && config->hz == bus->hz) {
return;
}
- spi_port_config[bus->port].mode = bus->mode;
- spi_port_config[bus->port].hz = bus->hz;
+ config->mode = bus->mode;
+ config->hz = bus->hz;
- LL_SPI_SetBaudRatePrescaler(spi_port_defs[bus->port].channel, spi_find_divder(bus->hz));
+ LL_SPI_SetBaudRatePrescaler(port->channel, spi_find_divder(bus->hz));
if (bus->mode == SPI_MODE_LEADING_EDGE) {
- LL_SPI_SetClockPhase(spi_port_defs[bus->port].channel, LL_SPI_PHASE_1EDGE);
- LL_SPI_SetClockPolarity(spi_port_defs[bus->port].channel, LL_SPI_POLARITY_LOW);
+ LL_SPI_SetClockPhase(port->channel, LL_SPI_PHASE_1EDGE);
+ LL_SPI_SetClockPolarity(port->channel, LL_SPI_POLARITY_LOW);
} else if (bus->mode == SPI_MODE_TRAILING_EDGE) {
- LL_SPI_SetClockPhase(spi_port_defs[bus->port].channel, LL_SPI_PHASE_2EDGE);
- LL_SPI_SetClockPolarity(spi_port_defs[bus->port].channel, LL_SPI_POLARITY_HIGH);
+ LL_SPI_SetClockPhase(port->channel, LL_SPI_PHASE_2EDGE);
+ LL_SPI_SetClockPolarity(port->channel, LL_SPI_POLARITY_HIGH);
}
}
|
cleans up error handling on proxy reverse listener failures
|
@@ -1378,7 +1378,6 @@ _proxy_reverse_listen_cb(uv_stream_t* tcp_u, c3_i sas_i)
static void
_proxy_reverse_start(u3_proxy_conn* con_u, u3_noun sip)
{
- // XX free somewhere
u3_proxy_reverse* rev_u = _proxy_reverse_new(con_u, sip);
struct sockaddr_in add_u;
@@ -1386,9 +1385,7 @@ _proxy_reverse_start(u3_proxy_conn* con_u, u3_noun sip)
memset(&add_u, 0, sizeof(add_u));
add_u.sin_family = AF_INET;
add_u.sin_addr.s_addr = INADDR_ANY;
-
- // first available
- add_u.sin_port = 0;
+ add_u.sin_port = 0; // first available
uv_tcp_init(u3L, &rev_u->tcp_u);
@@ -1399,16 +1396,11 @@ _proxy_reverse_start(u3_proxy_conn* con_u, u3_noun sip)
if ( 0 != sas_i ||
0 != (sas_i = uv_listen((uv_stream_t*)&rev_u->tcp_u,
TCP_BACKLOG, _proxy_reverse_listen_cb)) ) {
- if ( UV_EADDRINUSE == sas_i ) {
uL(fprintf(uH, "proxy: listen: %s\n", uv_strerror(sas_i)));
-
- //XX wat do
- _proxy_conn_close(con_u);
uv_close((uv_handle_t*)&rev_u->tcp_u, (uv_close_cb)_proxy_reverse_free);
-
+ _proxy_conn_close(con_u);
return;
}
- }
c3_i len_i = sizeof(add_u);
@@ -1418,11 +1410,8 @@ _proxy_reverse_start(u3_proxy_conn* con_u, u3_noun sip)
(struct sockaddr*)&add_u,
&len_i)) ) {
uL(fprintf(uH, "proxy: sockname: %s\n", uv_strerror(sas_i)));
-
- // XX wat do
- _proxy_conn_close(con_u);
uv_close((uv_handle_t*)&rev_u->tcp_u, (uv_close_cb)_proxy_reverse_free);
-
+ _proxy_conn_close(con_u);
}
else {
rev_u->por_s = ntohs(add_u.sin_port);
|
[CMAKE] Fixed builds with '.c' in the path
|
@@ -369,9 +369,12 @@ set(WRAPPEDS
"${BOX86_ROOT}/src/wrapped/wrappedcrashhandler.c"
)
+# If BOX86_ROOT contains a ".c", the build breaks...
+string(REPLACE ".c" "_private.h" MODROOT ${BOX86_ROOT})
set(WRAPPEDS_HEAD "${BOX86_ROOT}/src/wrapped/wrappedd3dadapter9_gen.h")
foreach(A ${WRAPPEDS})
- string(REPLACE ".c" "_private.h" B ${A})
+ string(REPLACE ".c" "_private.h" C ${A})
+ string(REPLACE "${MODROOT}" "${BOX86_ROOT}" B ${C})
set(WRAPPEDS_HEAD ${WRAPPEDS_HEAD} ${B})
set_source_files_properties(${A} PROPERTIES OBJECT_DEPENDS ${B})
endforeach()
|
WebView: extending interface to add getCookies and removeCookie [ci skip]
|
@@ -270,6 +270,32 @@ For most mobile platforms, WebView.execute_js has been implemented via redirecti
</PARAMS>
</METHOD>
+ <METHOD name="getCookies">
+ <DESC>Returns cookies map for specified URL. Can only be called from UI thread. Crosswalk is not supported.</DESC>
+ <PLATFORM>Android, iOS</PLATFORM>
+ <PARAMS>
+ <PARAM name="url" type="STRING">
+ <DESC>An URL to retrieve cookies for.</DESC>
+ </PARAM>
+ </PARAMS>
+
+ <RETURN type="HASH">
+ </RETURN>
+ </METHOD>
+
+ <METHOD name="removeCookie">
+ <DESC>Removes cookie by its name for specified URL. Can only be called from UI thread. Crosswalk is not supported.</DESC>
+ <PLATFORM>Android, iOS</PLATFORM>
+ <PARAMS>
+ <PARAM name="url" type="STRING">
+ <DESC>An URL to remove cookie from.</DESC>
+ </PARAM>
+ <PARAM name="name" type="STRING">
+ <DESC>A cookie name to be removed.</DESC>
+ </PARAM>
+ </PARAMS>
+ </METHOD>
+
<METHOD name="save">
<DESC>Save current page to file system.</DESC>
<PLATFORM>iOS, Android</PLATFORM>
|
Update test_cstrhelper.cpp
Fixed mem leak
|
******************************************************************************
*/
+#include <string>
+
#define BOOST_TEST_MODULE cstr_helper
#include <boost/test/unit_test.hpp>
@@ -30,15 +32,15 @@ BOOST_AUTO_TEST_SUITE(test_cstrhelper)
BOOST_AUTO_TEST_CASE(test_duplicate) {
- char source[] = "I will be rewarded for good behavior.";
+
+ std::string source = "I will be rewarded for good behavior.";
char *dest = NULL;
- cstr_duplicate(&dest, source);
+ cstr_duplicate(&dest, source.c_str());
BOOST_CHECK(check_string(dest, source));
BOOST_CHECK(cstr_isnullterm(dest) == true);
free(dest);
- free(source);
}
|
count FT-PSK of ASSOCIATIONREQUEST frames
|
@@ -186,6 +186,7 @@ static long int authnetworkeapcount;
static long int authunknowncount;
static long int associationrequestcount;
static long int associationrequestpskcount;
+static long int associationrequestftpskcount;
static long int associationrequestpsk256count;
static long int associationrequestsae256count;
static long int associationrequestsae384bcount;
@@ -492,6 +493,7 @@ authnetworkeapcount = 0;
authunknowncount = 0;
associationrequestcount = 0;
associationrequestpskcount = 0;
+associationrequestftpskcount = 0;
associationrequestpsk256count = 0;
associationrequestsae256count = 0;
associationrequestsae384bcount = 0;
@@ -677,6 +679,7 @@ if(authnetworkeapcount > 0) fprintf(stdout, "AUTHENTICATION (NETWORK EAP)......
if(authunknowncount > 0) fprintf(stdout, "AUTHENTICATION (unknown).................: %ld\n", authunknowncount);
if(associationrequestcount > 0) fprintf(stdout, "ASSOCIATIONREQUEST (total)...............: %ld\n", associationrequestcount);
if(associationrequestpskcount > 0) fprintf(stdout, "ASSOCIATIONREQUEST (PSK).................: %ld\n", associationrequestpskcount);
+if(associationrequestftpskcount > 0) fprintf(stdout, "ASSOCIATIONREQUEST (FT using PSK)........: %ld\n", associationrequestftpskcount);
if(associationrequestpsk256count > 0) fprintf(stdout, "ASSOCIATIONREQUEST (PSK SHA256)..........: %ld\n", associationrequestpsk256count);
if(associationrequestsae256count > 0) fprintf(stdout, "ASSOCIATIONREQUEST (SAE SHA256)..........: %ld\n", associationrequestsae256count);
if(associationrequestsae384bcount > 0) fprintf(stdout, "ASSOCIATIONREQUEST (SAE SHA384 SUITE B)..: %ld\n", associationrequestsae384bcount);
@@ -4016,6 +4019,7 @@ else if(((tags.akm &TAK_PSK) == TAK_PSK) || ((tags.akm &TAK_PSKSHA256) == TAK_PS
if(memcmp(&zeroed32, tags.pmkid, 16) != 0) addpmkid(macclient, macap, tags.pmkid);
}
if((tags.akm &TAK_PSK) == TAK_PSK) associationrequestpskcount++;
+else if((tags.akm &TAK_FT_PSK) == TAK_FT_PSK) associationrequestftpskcount++;
else if((tags.akm &TAK_PSKSHA256) == TAK_PSKSHA256) associationrequestpsk256count++;
else if((tags.akm &TAK_SAE_SHA256) == TAK_SAE_SHA256) associationrequestsae256count++;
else if((tags.akm &TAK_SAE_SHA384B) == TAK_SAE_SHA384B) associationrequestsae384bcount++;
|
specify correct MD5 for libusb-1.0.23.7z
|
@@ -79,7 +79,7 @@ if(NOT LIBUSB_FOUND)
file(DOWNLOAD
https://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-${LIBUSB_WIN_VERSION}/libusb-${LIBUSB_WIN_VERSION}.7z/download
${LIBUSB_WIN_ARCHIVE_PATH}
- EXPECTED_MD5 750e64b45aca94fafbdff07171004d03
+ EXPECTED_MD5 cf3d38d2ff053ef343d10c0b8b0950c2
)
endif()
file(MAKE_DIRECTORY ${LIBUSB_WIN_OUTPUT_FOLDER})
|
Fix cnid overflow issue in mutation struct.
|
@@ -130,7 +130,7 @@ struct c0sk_mutation {
atomic64_t c0skm_tseqno __aligned(SMP_CACHE_BYTES);
volatile u64 c0skm_reqtime __aligned(SMP_CACHE_BYTES);
- u8 c0skm_cnid[HSE_KVS_COUNT_MAX] __aligned(SMP_CACHE_BYTES);
+ u64 c0skm_cnid[HSE_KVS_COUNT_MAX] __aligned(SMP_CACHE_BYTES);
};
_Static_assert(HSE_KVS_COUNT_MAX <= 256, "c0skm_cnid type too small");
|
reverted old function to proper compare w old
|
@@ -303,6 +303,30 @@ static uint8_t *add_number_to_sign(uint8_t *sign, const xdag_hash_t num)
for (i = 0; i < sizeof(xdag_hash_t) && !n[i]; ++i);
+ leadzero = (i < sizeof(xdag_hash_t) && n[i] & 0x80);
+ len = (sizeof(xdag_hash_t) - i) + leadzero;
+ *sign++ = 0x02;
+ *sign++ = len;
+
+ if (leadzero) {
+ *sign++ = 0;
+ }
+
+ while (i < sizeof(xdag_hash_t)) {
+ *sign++ = n[i++];
+ }
+
+ return sign;
+}
+
+
+static uint8_t *add_number_to_sign_noopenssl(uint8_t *sign, const xdag_hash_t num)
+{
+ uint8_t *n = (uint8_t*)num;
+ int i, len, leadzero;
+
+ for (i = 0; i < sizeof(xdag_hash_t) && !n[i]; ++i);
+
leadzero = (i < sizeof(xdag_hash_t) && n[i] & 0x80);
len = (sizeof(xdag_hash_t) - i) + leadzero;
*sign++ = 0x02;
@@ -430,8 +454,8 @@ int i=0;
uint8_t sign_buf[72], *ptr;
//int res;
- ptr = add_number_to_sign(sign_buf + 2, sign_r);
- ptr = add_number_to_sign(ptr, sign_s);
+ ptr = add_number_to_sign_noopenssl(sign_buf + 2, sign_r);
+ ptr = add_number_to_sign_noopenssl(ptr, sign_s);
sign_buf[0] = 0x30;
sign_buf[1] = ptr - sign_buf - 2;
|
tasking_get_task_with_pid searches from the start of the linked list instead of from the running task
|
@@ -103,10 +103,10 @@ static void _tasking_add_task_to_runlist(task_small_t* task) {
}
task_small_t* tasking_get_task_with_pid(int pid) {
- if (!_current_task_small) {
+ if (!_task_list_head) {
return NULL;
}
- task_small_t* iter = _current_task_small;
+ task_small_t* iter = _task_list_head;
for (int i = 0; i < MAX_TASKS; i++) {
if ((iter)->id == pid) {
return iter;
@@ -379,23 +379,18 @@ void tasking_init() {
_task_list_head = _current_task_small;
tasking_goto_task(_current_task_small);
- /*
- task_small_t* t = task_spawn((uint32_t)task_sleepy);
- printf("bootstrap task is pid %d\n", _current_task_small->id);
- printf("sleepy task is pid %d\n", t->id);
- task_spawn((uint32_t)task_new);
- thread_spawn((uint32_t)tasking_update_blocked_tasks);
- */
- task_spawn(idle_task, PRIORITY_NONE);
- _iosentinel_task = task_spawn(update_blocked_tasks, PRIORITY_NONE);
+ task_spawn(idle_task, PRIORITY_IDLE, "idle");
+ //_iosentinel_task = task_spawn(update_blocked_tasks, PRIORITY_NONE);
printf_info("Multitasking initialized");
+ asm("sti");
pit_callback = timer_callback_register((void*)tasking_timer_tick, 100, true, 0);
}
int fork() {
Deprecated();
+ return -1;
}
void* unsbrk(int UNUSED(increment)) {
|
max7456: speed up clear
|
@@ -171,22 +171,17 @@ uint8_t max7456_clear_async() {
return 0;
}
- static uint8_t clr_col = 0;
- static uint8_t clr_row = 0;
+ static uint8_t row = 0;
static const uint8_t buffer[] = " ";
- max7456_push_string(OSD_ATTR_TEXT, clr_col, clr_row, buffer, 15);
-
- clr_row++;
- if (clr_row > MAX7456_ROWS) {
- clr_row = 0;
- clr_col += 15;
- if (clr_col > 15) {
- clr_col = 0;
+ max7456_push_string(OSD_ATTR_TEXT, 0, row, buffer, 32);
+
+ row++;
+
+ if (row > MAX7456_ROWS) {
+ row = 0;
return 1;
}
- }
-
return 0;
}
|
Use BBR CC for multipath perf tests
|
@@ -450,6 +450,7 @@ int multipath_test_one(uint64_t max_completion_microsec, multipath_test_enum_t t
}
else if (test_id == multipath_test_perf) {
multipath_test_perf_links(test_ctx, 0);
+ picoquic_set_default_congestion_algorithm(test_ctx->qserver, picoquic_bbr_algorithm);
}
test_ctx->c_to_s_link->queue_delay_max = 2 * test_ctx->c_to_s_link->microsec_latency;
test_ctx->s_to_c_link->queue_delay_max = 2 * test_ctx->s_to_c_link->microsec_latency;
@@ -738,7 +739,7 @@ int multipath_back1_test()
/* Test that a typical wifi+lte scenario provides good performance */
int multipath_perf_test()
{
- uint64_t max_completion_microsec = 1400000;
+ uint64_t max_completion_microsec = 1450000;
return multipath_test_one(max_completion_microsec, multipath_test_perf, 0);
}
@@ -1236,7 +1237,7 @@ int simple_multipath_back1_test()
int simple_multipath_perf_test()
{
- uint64_t max_completion_microsec = 1800000;
+ uint64_t max_completion_microsec = 1450000;
return multipath_test_one(max_completion_microsec, multipath_test_perf, 1);
}
|
[OpenGL] Cleanup stderr output a little
|
@@ -90,7 +90,6 @@ void imgui_create(void *ctx)
imgui_custom_style(params);
GLint vp [4]; glGetIntegerv (GL_VIEWPORT, vp);
- printf("viewport %d %d %d %d\n", vp[0], vp[1], vp[2], vp[3]);
ImGui::GetIO().IniFilename = NULL;
ImGui::GetIO().DisplaySize = ImVec2(vp[2], vp[3]);
@@ -163,7 +162,7 @@ void* get_proc_address(const char* name) {
void (*func)() = (void (*)())real_dlsym( RTLD_NEXT, name );
if (!func) {
- std::cerr << "MangoHud: Failed to get function '" << name << "'" << std::endl;
+ std::cerr << "MANGOHUD: Failed to get function '" << name << "'" << std::endl;
exit( 1 );
}
@@ -175,7 +174,7 @@ void* get_glx_proc_address(const char* name) {
// Force load libGL then. If it still doesn't find it, get_proc_address should quit the program
void *handle = dlopen("libGL.so.1", RTLD_GLOBAL | RTLD_LAZY | RTLD_DEEPBIND);
if (!handle)
- std::cerr << "MangoHud: couldn't find libGL.so.1" << std::endl;
+ std::cerr << "MANGOHUD: couldn't find libGL.so.1" << std::endl;
gl.Load();
}
@@ -196,7 +195,9 @@ EXPORT_C_(void *) glXCreateContext(void *dpy, void *vis, void *shareList, int di
{
gl.Load();
void *ctx = gl.glXCreateContext(dpy, vis, shareList, direct);
+#ifndef NDEBUG
std::cerr << __func__ << ":" << ctx << std::endl;
+#endif
return ctx;
}
@@ -344,11 +345,11 @@ EXPORT_C_(void*) dlsym(void * handle, const char * name)
{
void* func = find_ptr(name);
if (func) {
- //std::cerr << __func__ << ":" << name << std::endl;
+ //fprintf(stderr,"%s: local: %s\n", __func__ , name);
return func;
}
- //std::cerr << __func__ << ": foreign: " << name << std::endl;
+ //fprintf(stderr,"%s: foreign: %s\n", __func__ , name);
return real_dlsym(handle, name);
}
#endif
\ No newline at end of file
|
testcase/network: fix svace issue
fix handle_leak issue in network TC
|
@@ -74,8 +74,9 @@ void tc_net_recvfrom_sock_n(void)
int fd = socket(AF_INET, SOCK_STREAM, IPPROTO_UDP);
int ret = recvfrom(fd, buffer, MAXRCVLEN, 0, (struct sockaddr *)&serverStorage, &addr_size);
- TC_ASSERT_EQ("recvfrom", ret, -1);
+ TC_ASSERT_EQ_CLEANUP("recvfrom", ret, -1, close(fd));
TC_SUCCESS_RESULT();
+ close(fd);
}
@@ -125,6 +126,7 @@ void *recvfrom_udpserver(void *args)
tc_net_recvfrom_p(SocketFD);
tc_net_recvfrom_sock_n();
tc_net_recvfrom_n(SocketFD);
+ close(SocketFD);
return 0;
@@ -154,6 +156,7 @@ void *recvfrom_udpclient(void *args)
dest.sin_port = htons(PORTNUM);
fromlen = sizeof(dest);
sendto(mysocket, buffer, len, 0, (struct sockaddr *)&dest, fromlen);
+ close(mysocket);
return 0;
|
JNI: Only strip whitespace from defined variable
|
@@ -5,8 +5,10 @@ include (SafeCheckSymbolExists)
if (DEPENDENCY_PHASE)
if (APPLE)
execute_process (COMMAND "/usr/libexec/java_home" OUTPUT_VARIABLE JAVA_HOME)
+ if (JAVA_HOME)
string (STRIP ${JAVA_HOME}
JAVA_HOME)
+ endif (JAVA_HOME)
endif ()
find_package (JNI QUIET)
|
bond: problem switching from l2 to l3
when the last interface is removed from l2 in the bonding group, we should
invoke ethernet_set_rx_direct to allow ip packets to go directly to
ip4-input.
|
@@ -104,6 +104,17 @@ bond_set_l2_mode_function (vnet_main_t * vnm,
ethernet_set_rx_redirect (vnm, sif_hw, 1);
}
}
+ else if ((bif_hw->l2_if_count == 0) && (l2_if_adjust == -1))
+ {
+ /* Just removed last L2 subinterface on this port */
+ vec_foreach (sw_if_index, bif->slaves)
+ {
+ sif_hw = vnet_get_sup_hw_interface (vnm, *sw_if_index);
+
+ /* Allow ip packets to go directly to ip4-input etc */
+ ethernet_set_rx_redirect (vnm, sif_hw, 0);
+ }
+ }
return 0;
}
|
Document when a new session ticket gets created on resumption
|
@@ -77,6 +77,12 @@ the key that was used to encrypt the session ticket.
When the B<gen_cb> callback is invoked, the SSL_get_session() function can be
used to retrieve the SSL_SESSION for SSL_SESSION_set1_ticket_appdata().
+By default, in TLSv1.2 and below, a new session ticket is not issued on a
+successful resumption and therefore B<gen_cb> will not be called. In TLSv1.3 the
+default behaviour is to always issue a new ticket on resumption. In both cases
+this behaviour can be changed if a ticket key callback is in use (see
+L<SSL_CTX_set_tlsext_ticket_key_cb(3)>).
+
=head1 RETURN VALUES
The SSL_CTX_set_session_ticket_cb(), SSL_SESSION_set1_ticket_appdata() and
|
Add sceKernelMemcpyToUserRo/Rx function nids
|
@@ -9547,6 +9547,8 @@ modules:
ksceKernelGetUidDLinkClass: 0xC105604E
ksceKernelGetUidHeapClass: 0x4CCA935D
ksceKernelGetUidMemBlockClass: 0xAF729575
+ ksceKernelMemcpyToUserRo: 0xA6F95838
+ ksceKernelMemcpyToUserRx: 0x67BAD5B4
ksceKernelNameHeapGetInfo: 0xE443253B
ksceKernelRxMemcpyKernelToUserForPid: 0x30931572
ksceKernelSysrootAlloc: 0xC0A4D2F3
|
TEST: Pass -no-CAstore in 80-test_ocsp.t
Without passing -no-CAstore the default CAstore will be used and the
testsuite will fail the system has certificates installed.
Fixes:
|
@@ -45,7 +45,7 @@ sub test_ocsp {
"-partial_chain", @check_time,
"-CAfile", catfile($ocspdir, $CAfile),
"-verify_other", catfile($ocspdir, $untrusted),
- "-no-CApath"])),
+ "-no-CApath", "-no-CAstore"])),
$title); });
}
|
Update power.h
Added cold reset, shutdown and suspend functions.
|
@@ -142,6 +142,27 @@ int scePowerGetGpuClockFrequency(void);
*/
int scePowerGetGpuXbarClockFrequency(void);
+/**
+ * Requests PS Vita to do a cold reset
+ *
+ * @return always 0
+ */
+int scePowerRequestColdReset(void);
+
+/**
+ * Requests PS Vita to go into standby
+ *
+ * @return always 0
+ */
+int scePowerRequestStandby(void);
+
+/**
+ * Requests PS Vita to suspend
+ *
+ * @return always 0
+ */
+int scePowerRequestSuspend(void);
+
/**
* Sets CPU clock frequency
*
|
NimBLE AFR: Fix Notification/Indication tx handling
The handling of notifications/indications is done in BLE_GAP_EVENT_NOTIFY_TX where the appropriate status is returned.
So, it is not required in prvBTSendIndication
|
@@ -616,16 +616,6 @@ BTStatus_t prvBTSendIndication( uint8_t ucServerIf,
{
ESP_LOGD( TAG, "Send Notifications" );
xESPstatus = ble_gattc_notify_custom( usConnId, usAttributeHandle + gattOffset, om );
-
- if( xGattServerCb.pxIndicationSentCb != NULL )
- {
- if( xESPstatus != 0 )
- {
- xStatus = eBTStatusFail;
- }
-
- xGattServerCb.pxIndicationSentCb( usConnId, xStatus );
- }
}
if( xESPstatus != 0 )
|
[vpp-705]uri_cli issue:show session get nothing tips when session management disable
|
@@ -80,7 +80,7 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
if (!smm->is_enabled)
{
- clib_error_return (0, "session layer is not enabled");
+ return clib_error_return (0, "session layer is not enabled");
}
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
@@ -152,7 +152,7 @@ clear_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
if (!smm->is_enabled)
{
- clib_error_return (0, "session layer is not enabled");
+ return clib_error_return (0, "session layer is not enabled");
}
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.