diff options
| author | 杨威 <[email protected]> | 2023-02-17 14:01:39 +0800 |
|---|---|---|
| committer | 杨威 <[email protected]> | 2023-02-17 14:02:20 +0800 |
| commit | 851bb081d4f16f2af689634a8dcc062933af806e (patch) | |
| tree | 0c53aab5c840a95539a0c6702006777ec8957e34 | |
| parent | 2044adaf670e601dca45c283ce031ef7c603de01 (diff) | |
🐞 fix(streaminfo_private->packet_io_context): 修复char类型定义可能出现-1的bugv4.2.94
| -rw-r--r-- | include/private/stream_internal.h | 4 | ||||
| -rw-r--r-- | src/packet_io/sendpacket.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/private/stream_internal.h b/include/private/stream_internal.h index 53e640d..eaf736b 100644 --- a/include/private/stream_internal.h +++ b/include/private/stream_internal.h @@ -191,8 +191,8 @@ struct streaminfo_private unsigned int hash_slave; /* 2015-12-14 lijia add, ʹ��linux_jhash����ʱ, ����ͬʱ�õ��������ϵ�HASHֵ, ��HASH����ȷ����HASH����SLOTλ��, slave_HASH���ڿ��ٱȽϵ�ַ�Ƿ���� */ unsigned char hash_not_head_times;/* 2015-12-15 lijia add, ��ǰindex����HASH SLOT�ĵ�һλ�Ĵ��� */ unsigned char cur_layer_raw_hdr_len; /* 2017-10-31 lijia add, ��ǰ���ԭʼ����ַ����, ��pppͷ��ѹ��, ԭ���汾���������״̬, ����ʱҲ����֪��ַ������ */ - char __pad:3; - char packet_io_context:1; /* 2019-09-07 lijia add, for polling entry send packet */ + unsigned char __pad:3; + unsigned char packet_io_context:1; /* 2019-09-07 lijia add, for polling entry send packet */ unsigned char stream_close_reason:4; /* 2019-02-14 lijia add, ����TCPʹ��tcpdetail_private��link_state����, ����UDP֮ǰû��, ���pad�����˱��� */ unsigned char gdev_block_timer; /* ===8 bytes=== */ diff --git a/src/packet_io/sendpacket.c b/src/packet_io/sendpacket.c index d26b389..50b924e 100644 --- a/src/packet_io/sendpacket.c +++ b/src/packet_io/sendpacket.c @@ -2447,7 +2447,7 @@ static raw_pkt_t *update_raw_pkt(struct streaminfo_private *stream_pr, uchar snd { raw_pkt_t *inject_raw_pkt = NULL; - if (stream_pr->packet_io_context == 1) + if (stream_pr->packet_io_context != 0) { /* �ڰ�����������, ����û�п���polling, do nothing */ *inject_dir_reverse = ((snd_dir == stream_pr->stream_public.routedir) ? 0 : 1); |