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

fix(agw): Deleted temporary file emm_headers.hpp and moved functions out of extern #14489

Merged

Conversation

pruthvihebbani
Copy link
Contributor

@pruthvihebbani pruthvihebbani commented Nov 18, 2022

fix(agw): Deleted temporary file emm_headers.hpp and moved functions out of extern

Summary

In order to resolve undefined references, function declarations that were causing undefined references were commented out in the original files and added to a temporary file emm_headers.hpp. Now that all the files in mme_app and nas are migrated to C++, emm_headers.hpp is not needed. In this PR emm_headers.hpp is deleted and the function declarations are uncommented.

Test Plan

Executed the following builds/tests:

  1. s1ap integ_tests
  2. mme unit test
  3. bazel build --config=production //lte/gateway/c/core:agw_of
  4. bazel test //lte/gateway/c/core/oai/test/amf:amf_stateless_test
  5. bazel test //lte/gateway/c/core/...
  6. export FEATURES=mme_oai; make build_oai

Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
@pull-request-size pull-request-size bot added the size/XL Denotes a Pull Request that changes 500-999 lines. label Nov 18, 2022
@github-actions
Copy link
Contributor

Thanks for opening a PR! 💯

A couple initial guidelines

Howto

  • Reviews. The "Reviewers" listed for this PR are the Magma maintainers who will shepherd it.
  • Checks. All required CI checks must pass before merge.
  • Merge. Once approved and passing CI checks, use the ready2merge label to indicate the maintainers can merge your PR.

More info

Please take a moment to read through the Magma project's

If this is your first Magma PR, also consider reading

@github-actions github-actions bot added the component: agw Access gateway-related issue label Nov 18, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Nov 18, 2022

FeG Lint & Test

    2 files  203 suites   40s ⏱️
374 tests 374 ✔️ 0 💤 0
388 runs  388 ✔️ 0 💤 0

Results for commit 59fb1c7.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Nov 18, 2022

DP Lint & Test

14 tests   14 ✔️  2m 20s ⏱️
  1 suites    0 💤
  1 files      0

Results for commit 59fb1c7.

♻️ This comment has been updated with latest results.

@pruthvihebbani pruthvihebbani marked this pull request as ready for review November 18, 2022 10:40
@pruthvihebbani pruthvihebbani requested review from a team, vktng and rsarwad November 18, 2022 10:40
@pruthvihebbani pruthvihebbani changed the title fix(agw): Deleted temporary file emm_headers.hpp and functions under extern fix(agw): Deleted temporary file emm_headers.hpp and moved functions out of extern Nov 18, 2022
@LKreutzer LKreutzer removed the request for review from vktng November 22, 2022 15:27
@ajahl
Copy link
Contributor

ajahl commented Nov 23, 2022

@pruthvihebbani, can you fix the conflicts?

@@ -55,7 +55,6 @@ extern "C" {
}
#endif
Copy link
Contributor

Choose a reason for hiding this comment

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

Space

@@ -26,7 +26,6 @@ extern "C" {
}
#endif
#include "lte/gateway/c/core/oai/tasks/nas/emm/emm_data.hpp"
Copy link
Contributor

Choose a reason for hiding this comment

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

Space

@@ -23,7 +23,6 @@ extern "C" {
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Remove dynamic_memory_check.h from extern C

@@ -34,7 +36,6 @@ extern "C" {
#include "lte/gateway/c/core/oai/include/mme_config.hpp"
#include "lte/gateway/c/core/oai/include/s6a_messages_types.hpp"
#include "lte/gateway/c/core/oai/tasks/s6a/s6a_messages.hpp"
#include "lte/gateway/c/core/oai/tasks/s6a/s6a_fd_iface.hpp"
#include "orc8r/gateway/c/common/service303/MetricsHelpers.hpp"

#include <iostream>
Copy link
Contributor

Choose a reason for hiding this comment

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

Move these includes above

@@ -24,6 +24,7 @@

#pragma once

#include "S1ap_S1AP-PDU.h"
#include "lte/gateway/c/core/common/common_defs.h"
#include "lte/gateway/c/core/oai/common/common_types.h"
#include "lte/gateway/c/core/oai/include/mme_app_messages_types.hpp"
Copy link
Contributor

Choose a reason for hiding this comment

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

Include bstrlib.h, s1ap_messages_types.h under extern C

@@ -22,6 +22,8 @@
\email: lionel.gauthier@eurecom.fr
*/

#include "lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_nas_procedures.hpp"

#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
Copy link
Contributor

Choose a reason for hiding this comment

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

Move bstrlib.h file under extern C.

Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Copy link
Contributor

@rsarwad rsarwad left a comment

Choose a reason for hiding this comment

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

LGTM

Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
@pruthvihebbani pruthvihebbani merged commit 0e0c709 into magma:master Nov 25, 2022
lucasgonze pushed a commit to lucasgonze/magma that referenced this pull request Feb 29, 2024
…out of extern (magma#14489)

* Deleted temporary file emm_headers.hpp and moved functions out of extern

Signed-off-by: Pruthvi Hebbani <pruthvi.hebbani@radisys.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: agw Access gateway-related issue size/XL Denotes a Pull Request that changes 500-999 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants