Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop otp nvt update #575

Merged
merged 28 commits into from
Jun 4, 2019
Merged

Conversation

janowagner
Copy link
Member

This pull request removed the handling of NVT updates via OTP.

Any code parts that are subsequently not needed anymore are also removed.

@janowagner janowagner requested a review from a team May 30, 2019 11:48
@janowagner janowagner added the work in progress This pull request should not be merged yet, more commits are expected label May 30, 2019
@janowagner janowagner force-pushed the drop_otp_nvt_update branch 2 times, most recently from ff37c87 to ef5e937 Compare May 31, 2019 09:06
@janowagner janowagner removed the work in progress This pull request should not be merged yet, more commits are expected label May 31, 2019
Copy link
Contributor

@mattmundell mattmundell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great, but there is still some OTP NVT update code in there.

gvmd.c should no longer be calling update_nvt_cache. As a result init_gmpd,
init_gmp, init_manage, etc no longer need the nvt_cache_mode argument.

Also --osp-vt-update should change, because it is the only option. Could be
replaced with --vt-update-socket. And we need a default in case it is not given.

src/scanner.c Outdated Show resolved Hide resolved
src/scanner.c Outdated Show resolved Hide resolved
src/scanner.h Outdated Show resolved Hide resolved
src/scanner.h Outdated Show resolved Hide resolved
src/manage_sql_nvts.c Outdated Show resolved Hide resolved
janowagner added 24 commits May 31, 2019 22:01
This also removes acknowledge_feed_version_info() which wasn't used
anywhere.
This function is not needed anymore. Subsequently
also functions update_old_config_preferences(),
insert_nvts_list() and insert_nvt_from_nvti().

The function make_nvt_from_nvti() is actually not needed
also. But it might be used for chunked insertion of
nvts and therefore it is kept and a dumy call added to make
the compiler accept the presence.
Subsequently, also used functions and a static global vairable
are removed as they are unused now.
And subsequently unused global variable.
This is to be consistent with other protos.
Currently it is not really used, so remove it.
If we really need it later, we can pull it from
the repository.
This function handled OTP-based NVT update.
Removed call of this function and also the function itself.
It is only called with 0 anyway.
It is called with "0" always anyway.
It is called with "0" always anyway.
It is called with "0" always anyway.
It is always "0", so remove the parameter
and the conditional for non-"0" as it can
never happen anymore.
@janowagner janowagner force-pushed the drop_otp_nvt_update branch from 434e01f to de2c113 Compare May 31, 2019 22:41
@janowagner
Copy link
Member Author

gvmd.c should no longer be calling update_nvt_cache. As a result init_gmpd,
init_gmp, init_manage, etc no longer need the nvt_cache_mode argument.

Done.

@janowagner
Copy link
Member Author

Also --osp-vt-update should change, because it is the only option. Could be
replaced with --vt-update-socket. And we need a default in case it is not given.

I suggest to keep as is and consolidate once the entire OTP is replaced by OSP.

@mattmundell
Copy link
Contributor

Also --osp-vt-update should change, because it is the only option. Could be
replaced with --vt-update-socket. And we need a default in case it is not given.

I suggest to keep as is and consolidate once the entire OTP is replaced by OSP.

Would like to see some sort of warning so this doesn't catch people out, but I want
to merge this. We can add in a subsequent PR.

@mattmundell mattmundell merged commit ee993fd into greenbone:master Jun 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants