diff options
| author | yangwei <[email protected]> | 2023-08-21 19:13:48 +0800 |
|---|---|---|
| committer | yangwei <[email protected]> | 2023-08-21 20:29:32 +0800 |
| commit | dfe35c09413a0ada869d68f839b63e1eccf04d4e (patch) | |
| tree | ed7a34766423aa869eb95a1f1dc4c8e4ffb819a1 | |
| parent | 2e058f162b155cb00de5f4892213326d53345798 (diff) | |
🐞 fix(inject): 控制报文不增加inject_sid;移除centos7加壳流程v4.3.22
| -rw-r--r-- | .gitlab-ci.yml | 21 | ||||
| -rw-r--r-- | src/packet_io/sendpacket.c | 10 |
2 files changed, 8 insertions, 23 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acb39df..b08942b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -203,9 +203,9 @@ release_build_release_for_centos8: ############################################################################### # envelope ############################################################################### -.define_before_envelope_centos7: +.define_before_envelope_centos8: stage: envelope - extends: .build_by_travis_for_centos7 + extends: .build_by_travis_for_centos8 variables: BUILD_TYPE: RelWithDebInfo MEM_POOL: JEMALLOC_STATIC @@ -218,15 +218,8 @@ release_build_release_for_centos8: tags: - share -envelope_rpm_for_centos7: - extends: .define_before_envelope_centos7 - artifacts: - name: "$SYMBOL_TARGET-pr-$CI_COMMIT_REF_NAME-release" - paths: - - build/*-pr-*.rpm - envelope_rpm_for_centos8: - extends: .define_before_envelope_centos7 + extends: .define_before_envelope_centos8 image: $BUILD_IMAGE_CENTOS8 artifacts: name: "$SYMBOL_TARGET-pr-$CI_COMMIT_REF_NAME-release" @@ -325,14 +318,6 @@ rpm_upload_for_centos7: script: - python3 rpm_upload_tools.py $PULP3_REPO_NAME $PULP3_DIST_NAME *.rpm -envelope_rpm_upload_for_centos7: - extends: .define_before_upload_centos7 - dependencies: - - envelope_rpm_for_centos7 - script: - - python3 rpm_upload_tools.py $PULP3_REPO_NAME $PULP3_DIST_NAME *-pr-*.rpm - - .define_before_upload_centos8: stage: upload image: $BUILD_IMAGE_CENTOS8 diff --git a/src/packet_io/sendpacket.c b/src/packet_io/sendpacket.c index b76395a..e6f0612 100644 --- a/src/packet_io/sendpacket.c +++ b/src/packet_io/sendpacket.c @@ -3000,16 +3000,16 @@ int __sapp_inject_pkt(struct streaminfo *raw_stream, enum sapp_inject_opt sio, } struct segment_id_list inject_sid = { {(unsigned int)sapp_global_val->config.packet_io.inject_pkt_prepend_segment_id}, 1}; - if (sapp_global_val->config.packet_io.inject_pkt_prepend_segment_id > 0) // update sid_prepend_list, insert inject_pkt_prepend_segment_id to head + if (sapp_global_val->config.packet_io.inject_pkt_prepend_segment_id > 0 && raw_stream_pr->is_ctrl_pkt == 0) // update sid_prepend_list, insert inject_pkt_prepend_segment_id to head { if (raw_stream_pr->sid_prepend_list != NULL) { - unsigned int i=1; - for(; i < MIN(raw_stream_pr->sid_prepend_list->sz_sidlist, MAX_SID_NUM-1); i++) + unsigned int i = 0; + for(i = 0; i < MIN(raw_stream_pr->sid_prepend_list->sz_sidlist, MAX_SID_NUM-1); i++) { - inject_sid.sid_list[i] = raw_stream_pr->sid_prepend_list->sid_list[i]; + inject_sid.sid_list[i+1] = raw_stream_pr->sid_prepend_list->sid_list[i]; } - inject_sid.sz_sidlist=i; + inject_sid.sz_sidlist=i+1; } ((raw_pkt_t *)raw_pkt)->prepend_list = &inject_sid; } |