From cf99d1ad85d7dde05e05e75fc43125af725f5535 Mon Sep 17 00:00:00 2001 From: liuxueli Date: Tue, 15 Sep 2020 11:05:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=85=E5=AD=98=E6=B3=84?= =?UTF-8?q?=E6=BC=8F=E7=9A=84BUG=20=E4=BF=AE=E5=A4=8D=E5=8D=B8=E8=BD=BD?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/preInstall.sh | 3 +++ cmake/preUninstall.sh | 12 ++++++++++-- src/gquic_process.c | 2 ++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cmake/preInstall.sh b/cmake/preInstall.sh index 3ec1f37..765e889 100644 --- a/cmake/preInstall.sh +++ b/cmake/preInstall.sh @@ -1,9 +1,12 @@ #!/bin/sh DST=${RPM_INSTALL_PREFIX} + mkdir -p ${DST}/plug/protocol/ touch ${DST}/plug/conflist.inf + mkdir ${DST}/etc/ touch ${DST}/etc/entrylist.conf + if [[ -z `grep -rn 'quic.inf' ${DST}/plug/conflist.inf` ]];then sed -i '/\[protocol\]/a\./plug/protocol/quic/quic.inf' ${DST}/plug/conflist.inf fi diff --git a/cmake/preUninstall.sh b/cmake/preUninstall.sh index 99cb778..377a0f5 100644 --- a/cmake/preUninstall.sh +++ b/cmake/preUninstall.sh @@ -3,7 +3,15 @@ if [ $1 == 0 ]; then DST=${RPM_INSTALL_PREFIX} mkdir -p ${DST}/plug/business/ touch ${DST}/plug/conflist.inf + + mkdir -p ${DST}/etc/ + touch ${DST}/etc/entrylist.conf - sed -i '/quic.inf/d' ${DST}/plug/conflist.inf - sed -i '/QUIC/d' ${DST}etc/entrylist.conf + if [[ -f ${DST}/plug/conflist.inf ]];then + sed -i '/quic.inf/d' ${DST}/plug/conflist.inf + fi + + if [[ -f ${DST}/etc/entrylist.conf ]];then + sed -i '/QUIC/d' ${DST}/etc/entrylist.conf + fi fi diff --git a/src/gquic_process.c b/src/gquic_process.c index e56fcc8..f7176b5 100644 --- a/src/gquic_process.c +++ b/src/gquic_process.c @@ -255,6 +255,7 @@ static enum _QUIC_VERSION parse_q0to43_header(struct streaminfo *pstream, struct if(pstream->curdir==DIR_S2C && gquic_hdr->public_flags&GQUIC_PUBLIC_FLAG_VERSION) { + #if 0 gquic_hdr->is_version_negotiation=TRUE; // Version Negotiation Packet gquic_hdr->negotiation_version_num=(payload_len-*used_len)/sizeof(int); @@ -265,6 +266,7 @@ static enum _QUIC_VERSION parse_q0to43_header(struct streaminfo *pstream, struct gquic_hdr->negotiation_version_list[i]=*(unsigned int *)(payload+*used_len); *used_len+=sizeof(unsigned int); } + #endif return QUIC_VERSION_UNKNOWN; }