summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliuxueli <[email protected]>2020-09-15 11:05:51 +0800
committerliuxueli <[email protected]>2020-09-15 11:05:51 +0800
commitcf99d1ad85d7dde05e05e75fc43125af725f5535 (patch)
tree45404fecf106c811d2850bb67b686392627585f3
parentd6755d8b0c14953b5e40c4062fdf2499b73bb277 (diff)
修复内存泄漏的BUG
修复卸载插件报错的问题
-rw-r--r--cmake/preInstall.sh3
-rw-r--r--cmake/preUninstall.sh12
-rw-r--r--src/gquic_process.c2
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;
}