#13795: Initial commit for sflphone-android
includes: libexpat libyaml libdbus-c++ commoncpp ccrtp
libdbus (from android-4.0.4 sources)
TODO:
- git ignores "/jni/sflphone", sflphone repo should be cloned.
- sflphone-android only needs daemon directory. Ideally it should be possible
to clone it without cloning the whole sflphone project.
into sfl-android (commit 6a0fa7a "#13961: Fix cipher handling" has been used here)
- add pjsip-android project as a git submodule
- sflphone-android needs pjsip android project. Ideally daemon git repository
should not embed pjsip. Instead pjsip should be clone from official repositories.
Considering this, structure should have three distincts git repos:
sflphone-android/.git
sflphone-android/jni/ccrtp-1.8.0-android
sflphone-android/jni/commoncpp2-1.8.1-android
sflphone-android/jni/dbus
sflphone-android/jni/libdbus-c++-0.9.0-android
sflphone-android/jni/libexpat
sflphone-android/jni/libyaml
sflphone-android/jni/sflphone-daemon/.git
sflphone-android/jni/sflphone-daemon/src/audio
sflphone-android/jni/sflphone-daemon/src/config
sflphone-android/jni/sflphone-daemon/src/dbus
sflphone-android/jni/sflphone-daemon/src/history
sflphone-android/jni/sflphone-daemon/src/hooks
sflphone-android/jni/sflphone-daemon/src/iax
sflphone-android/jni/sflphone-daemon/src/sip
sflphone-android/jni/sflphone-daemon/src/video
sflphone-android/jni/pjsip-android/.git
Signed-off-by: Emeric Vigier <emeric.vigier@savoirfairelinux.com>
diff --git a/jni/dbus/test/data/invalid-messages/array-of-nil.message b/jni/dbus/test/data/invalid-messages/array-of-nil.message
new file mode 100644
index 0000000..1197a13
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/array-of-nil.message
@@ -0,0 +1,31 @@
+# Message with an array of NIL (not allowed)
+
+VALID_HEADER method_call
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.freedesktop.Foo'
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+ALIGN 8
+END_LENGTH Header
+
+START_LENGTH Body
+TYPE ARRAY
+TYPE NIL
+UINT32 5
+
+## we want it to fail because of type nil, not because the length is no good
+## so pad out the message with 5 bytes
+BYTE 1
+BYTE 2
+BYTE 3
+BYTE 4
+BYTE 5
+
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/array-with-mixed-types.message b/jni/dbus/test/data/invalid-messages/array-with-mixed-types.message
new file mode 100644
index 0000000..dea2d1e
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/array-with-mixed-types.message
@@ -0,0 +1,52 @@
+# Message with an array of array where the child arrays are of
+# different types
+
+VALID_HEADER method_call
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.freedesktop.Foo'
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+ALIGN 8
+END_LENGTH Header
+
+START_LENGTH Body
+
+TYPE ARRAY
+TYPE ARRAY
+TYPE UINT32
+
+LENGTH Array
+START_LENGTH Array
+
+## array of uint32
+LENGTH SubArray1
+START_LENGTH SubArray1
+UINT32 1
+UINT32 2
+UINT32 3
+END_LENGTH SubArray1
+
+## array of uint32
+LENGTH SubArray2
+START_LENGTH SubArray2
+UINT32 4
+UINT32 5
+END_LENGTH SubArray2
+
+## array of boolean
+LENGTH SubArray3
+START_LENGTH SubArray3
+BOOLEAN false
+BOOLEAN true
+END_LENGTH SubArray3
+
+END_LENGTH Array
+
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/bad-boolean-array.message b/jni/dbus/test/data/invalid-messages/bad-boolean-array.message
new file mode 100644
index 0000000..48000af
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/bad-boolean-array.message
@@ -0,0 +1,27 @@
+## a message with an invalid boolean array
+
+## VALID_HEADER includes a LENGTH Header and LENGTH Body
+VALID_HEADER method_call
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.freedesktop.Foo'
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+ALIGN 8
+END_LENGTH Header
+
+START_LENGTH Body
+TYPE ARRAY
+TYPE BOOLEAN
+ALIGN 4
+INT32 3
+BYTE 0
+BYTE 1
+BYTE 3
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/bad-boolean.message b/jni/dbus/test/data/invalid-messages/bad-boolean.message
new file mode 100644
index 0000000..09026db
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/bad-boolean.message
@@ -0,0 +1,22 @@
+## a message with an invalid boolean value
+
+## VALID_HEADER includes a LENGTH Header and LENGTH Body
+VALID_HEADER method_call
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.freedesktop.Foo'
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+ALIGN 8
+END_LENGTH Header
+
+START_LENGTH Body
+TYPE BOOLEAN
+BYTE 3
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/bad-endian.message b/jni/dbus/test/data/invalid-messages/bad-endian.message
new file mode 100644
index 0000000..e979baa
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/bad-endian.message
@@ -0,0 +1,25 @@
+## message with invalid endianness tag
+
+BYTE 'i'
+BYTE 1
+BYTE 0
+BYTE 0
+
+LENGTH Header
+LENGTH Body
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.freedesktop.Foo'
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+ALIGN 8
+END_LENGTH Header
+
+START_LENGTH Body
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/bad-header-field-alignment.message b/jni/dbus/test/data/invalid-messages/bad-header-field-alignment.message
new file mode 100644
index 0000000..22c0d7e
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/bad-header-field-alignment.message
@@ -0,0 +1,38 @@
+## last field incorrectly aligned to 4 bytes
+
+## VALID_HEADER includes a LENGTH Header and LENGTH Body
+VALID_HEADER method_call
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.freedesktop.Foo'
+
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+HEADER_FIELD UNKNOWN
+TYPE STRING
+STRING 'a'
+
+ALIGN 4
+
+HEADER_FIELD UNKNOWN
+TYPE ARRAY
+TYPE BYTE
+ALIGN 4
+LENGTH ThisByteArray
+START_LENGTH ThisByteArray
+BYTE 1
+BYTE 2
+END_LENGTH ThisByteArray
+
+
+ALIGN 8
+END_LENGTH Header
+START_LENGTH Body
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/boolean-has-no-value.message-raw b/jni/dbus/test/data/invalid-messages/boolean-has-no-value.message-raw
new file mode 100644
index 0000000..11b15c8
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/boolean-has-no-value.message-raw
Binary files differ
diff --git a/jni/dbus/test/data/invalid-messages/local-namespace.message b/jni/dbus/test/data/invalid-messages/local-namespace.message
new file mode 100644
index 0000000..8a72018
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/local-namespace.message
@@ -0,0 +1,21 @@
+## a message that is in the org.freedesktop.Local. namespace and thus
+## invalid
+
+## VALID_HEADER includes a LENGTH Header and LENGTH Body
+VALID_HEADER method_call
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.freedesktop.DBus.Local'
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Disconnected'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+ALIGN 8
+END_LENGTH Header
+
+START_LENGTH Body
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/no-dot-in-name.message b/jni/dbus/test/data/invalid-messages/no-dot-in-name.message
new file mode 100644
index 0000000..6d6317a
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/no-dot-in-name.message
@@ -0,0 +1,19 @@
+## a message with dotless interface
+
+## VALID_HEADER includes a LENGTH Header and LENGTH Body
+VALID_HEADER method_call
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'NoDotInHere'
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+ALIGN 8
+END_LENGTH Header
+START_LENGTH Body
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/not-nul-header-padding.message b/jni/dbus/test/data/invalid-messages/not-nul-header-padding.message
new file mode 100644
index 0000000..be846da
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/not-nul-header-padding.message
@@ -0,0 +1,25 @@
+## has one non-nul byte in header padding
+
+## VALID_HEADER includes a LENGTH Header and LENGTH Body
+VALID_HEADER method_call
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.freedesktop.Foo'
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+HEADER_FIELD UNKNOWN
+TYPE STRING
+STRING 'a'
+ALIGN 8
+## kill a padding byte and replace it
+CHOP 1
+BYTE 'q'
+END_LENGTH Header
+START_LENGTH Body
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/overlong-name.message b/jni/dbus/test/data/invalid-messages/overlong-name.message
new file mode 100644
index 0000000..c1f9079
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/overlong-name.message
@@ -0,0 +1,20 @@
+## a message with too-long name field
+
+## VALID_HEADER includes a LENGTH Header and LENGTH Body
+VALID_HEADER method_call
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.foo.bar.this.is.really.long 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200'
+
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+ALIGN 8
+END_LENGTH Header
+START_LENGTH Body
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/too-little-header-padding.message b/jni/dbus/test/data/invalid-messages/too-little-header-padding.message
new file mode 100644
index 0000000..358815a
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/too-little-header-padding.message
@@ -0,0 +1,24 @@
+## has one byte missing from header padding
+
+## VALID_HEADER includes a LENGTH Header and LENGTH Body
+VALID_HEADER method_call
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.freedesktop.Foo'
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+HEADER_FIELD UNKNOWN
+TYPE STRING
+STRING 'a'
+ALIGN 8
+## kill a padding byte
+CHOP 1
+END_LENGTH Header
+START_LENGTH Body
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/too-much-header-padding-by-far.message b/jni/dbus/test/data/invalid-messages/too-much-header-padding-by-far.message
new file mode 100644
index 0000000..2d2be3a
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/too-much-header-padding-by-far.message
@@ -0,0 +1,26 @@
+## has one byte extra header padding
+
+## VALID_HEADER includes a LENGTH Header and LENGTH Body
+VALID_HEADER method_call
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.freedesktop.Foo'
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+HEADER_FIELD UNKNOWN
+TYPE STRING
+STRING 'a'
+ALIGN 8
+BYTE 0
+ALIGN 8
+BYTE 0
+ALIGN 8
+END_LENGTH Header
+START_LENGTH Body
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/too-much-header-padding.message b/jni/dbus/test/data/invalid-messages/too-much-header-padding.message
new file mode 100644
index 0000000..0b1c294
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/too-much-header-padding.message
@@ -0,0 +1,23 @@
+## has one byte extra header padding
+
+## VALID_HEADER includes a LENGTH Header and LENGTH Body
+VALID_HEADER method_call
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.freedesktop.Foo'
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+HEADER_FIELD UNKNOWN
+TYPE STRING
+STRING 'a'
+ALIGN 8
+BYTE 0
+END_LENGTH Header
+START_LENGTH Body
+END_LENGTH Body
diff --git a/jni/dbus/test/data/invalid-messages/too-short-dict.message b/jni/dbus/test/data/invalid-messages/too-short-dict.message
new file mode 100644
index 0000000..ffc3cc5
--- /dev/null
+++ b/jni/dbus/test/data/invalid-messages/too-short-dict.message
@@ -0,0 +1,28 @@
+# Message with lots of different argument types
+
+VALID_HEADER method_call
+
+HEADER_FIELD INTERFACE
+TYPE STRING
+STRING 'org.freedesktop.Foo'
+HEADER_FIELD MEMBER
+TYPE STRING
+STRING 'Bar'
+HEADER_FIELD PATH
+TYPE OBJECT_PATH
+OBJECT_PATH '/foo'
+
+ALIGN 8
+
+END_LENGTH Header
+
+START_LENGTH Body
+TYPE DICT
+LENGTH Dict
+START_LENGTH Dict
+STRING 'uint32'
+TYPE UINT32
+UINT32 0x8765432
+STRING 'uint32'
+END_LENGTH Dict
+END_LENGTH Body