Skip to content

Config customisation #13

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jan 22, 2018
Merged

Config customisation #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
628bd69
Ignoring CLion config dir
SStorm Jan 22, 2018
a536aba
Allowing overriding config via a preprocessor flag
SStorm Jan 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,6 @@ build
*.pc
.DS_Store

.idea


1 change: 0 additions & 1 deletion include/icelib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

#include "sockaddr_util.h"
#include "icelibtypes.h"
#include "icelib_defines.h"

#include <stdint.h>

Expand Down
12 changes: 9 additions & 3 deletions include/icelib_defines.h → include/icelib_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* See License file
*/

#ifndef ICELIB_DEFINE_H
#define ICELIB_DEFINE_H
#ifndef ICELIB_ICELIB_CONFIG_H
#define ICELIB_ICELIB_CONFIG_H

#define ICELIB_RANDOM_SEGMENT_LENGTH (32 / 6)

Expand Down Expand Up @@ -36,5 +36,11 @@

#define ICELIB_FAIL_AFTER_MS 5000 /*5 sec*/

#define ICE_MAX_UFRAG_LENGTH (256 + 1) /* zero terminated */
#define ICE_MAX_PASSWD_LENGTH (256 + 1) /* zero terminated */
#define ICE_MAX_CANDIDATES 32
#define ICE_MAX_FOUNDATION_LENGTH (32 + 1) /* zero terminated */
#define ICE_MAX_MEDIALINES 20
#define ICE_MAX_COMPONENTS 2

#endif
#endif //ICELIB_ICELIB_CONFIG_H
14 changes: 5 additions & 9 deletions include/icelibtypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#ifndef ICELIBTYPES_H
#define ICELIBTYPES_H

#include "icelib_defines.h"
#include "stunlib.h"

#include <stdbool.h>
Expand All @@ -20,14 +19,11 @@ extern "C" {
#include <stdbool.h>
#endif


#define ICE_MAX_UFRAG_LENGTH (256 + 1) /* zero terminated */
#define ICE_MAX_PASSWD_LENGTH (256 + 1) /* zero terminated */
#define ICE_MAX_CANDIDATES 32
#define ICE_MAX_FOUNDATION_LENGTH (32 + 1) /* zero terminated */
#define ICE_MAX_MEDIALINES 20
#define ICE_MAX_COMPONENTS 2

#ifdef ICELIB_CUSTOM_CONFIG
#include ICELIB_CUSTOM_CONFIG
#else
#include "icelib_config.h"
#endif

/* -----------------------------------------------------------------------------
* */
Expand Down