qmimodem: send authentication credentials
PATCH 1/1 qmimodem: send authentication credentials
Pass authentication method, user and password
to QMI WDS service.
--- drivers/qmimodem/gprs-context.c | 24 ++++++++++++++++++++++++ drivers/qmimodem/wds.h | 7 +++++++ 2 files changed, 31 insertions(+)
drivers/qmimodem/gprs-context.c +24 -0
@@ -151,6 +151,7 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc,struct cb_data *cbd =cb_data_new (cb, user_data);struct qmi_param *param;uint8_t ip_family; +uint8_t auth;DBG ("cid %u" , ctx->cid);
@@ -178,6 +179,29 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc,qmi_param_append_uint8 (param,QMI_WDS_PARAM_IP_FAMILY , ip_family); +switch (ctx->auth_method) { +case OFONO_GPRS_AUTH_METHOD_CHAP : + auth =QMI_WDS_AUTHENTICATION_CHAP ; +break ; +case OFONO_GPRS_AUTH_METHOD_PAP : + auth =QMI_WDS_AUTHENTICATION_PAP ; +break ; +default : + auth =QMI_WDS_AUTHENTICATION_NONE ; +break ; + } +qmi_param_append_uint8 (param,QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE , + auth); + +if (ctx->username &&strlen (ctx->username)) { +qmi_param_append (param,QMI_WDS_PARAM_USERNAME , +strlen (ctx->username), ctx->username); + } + +if (ctx->password &&strlen (ctx->password)) +qmi_param_append (param,QMI_WDS_PARAM_PASSWORD , +strlen (ctx->password), ctx->password); +if (qmi_service_send (data->wds,QMI_WDS_START_NET , param, start_net_cb, cbd,NULL ) >0 )return ;
drivers/qmimodem/wds.h +7 -0
@@ -30,6 +30,13 @@/* Start WDS network interface */ #define QMI_WDS_PARAM_APN 0x14/* string */ #define QMI_WDS_PARAM_IP_FAMILY 0x19/* uint8 */ +#define QMI_WDS_PARAM_USERNAME 0x17/* string */ +#define QMI_WDS_PARAM_PASSWORD 0x18/* string */ +#define QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE 0x16/* uint8 */ + +#define QMI_WDS_AUTHENTICATION_NONE 0x0 +#define QMI_WDS_AUTHENTICATION_PAP 0x1 +#define QMI_WDS_AUTHENTICATION_CHAP 0x2#define QMI_WDS_RESULT_PKT_HANDLE 0x01/* uint32 */
Signature · 1 line
2.11.0
Hi Piotr,
Quoted 6 lines · Piotr Haber
Pass authentication method, user and password
to QMI WDS service.--- drivers/qmimodem/gprs-context.c | 24 ++++++++++++++++++++++++ drivers/qmimodem/wds.h | 7 +++++++ 2 files changed, 31 insertions(+)
Really nice to have this one. Just a couple of small nitpicks:
Quoted 18 lines
drivers/qmimodem/gprs-context.c +2
-0@@ -151,6 +151,7 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc,struct cb_data *cbd =cb_data_new (cb, user_data);struct qmi_param *param;uint8_t ip_family; +uint8_t auth;DBG ("cid %u" , ctx->cid);@@ -178,6 +179,29 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc,qmi_param_append_uint8 (param,QMI_WDS_PARAM_IP_FAMILY , ip_family); +switch (ctx->auth_method) {
drivers/qmimodem/gprs-context.c static void qmi_activate_primary(struct ofono_gprs_context *gc, · line 192
Quoted 10 lines
drivers/qmimodem/gprs-context.c +10
-0+case OFONO_GPRS_AUTH_METHOD_CHAP : + auth =QMI_WDS_AUTHENTICATION_CHAP ; +break ; +case OFONO_GPRS_AUTH_METHOD_PAP : + auth =QMI_WDS_AUTHENTICATION_PAP ; +break ; +default : + auth =QMI_WDS_AUTHENTICATION_NONE ; +break ; + }
Add an empty line here for me please. See doc/coding-style.txt item M1.
drivers/qmimodem/gprs-context.c static void qmi_activate_primary(struct ofono_gprs_context *gc, · line 196
Quoted 4 lines
drivers/qmimodem/gprs-context.c +4
-0+qmi_param_append_uint8 (param,QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE , + auth); + +if (ctx->username &&strlen (ctx->username)) {
ctx->username is an array, so this condition will always be true. strlen can be replaced by looking at ctx->username[0] and seeing if it is a nul char. e.g.:
if (ctx->username[0] != '\0')
qmi_param_append(...)
drivers/qmimodem/gprs-context.c static void qmi_activate_primary(struct ofono_gprs_context *gc, · line 199
Quoted 3 lines
drivers/qmimodem/gprs-context.c +3
-0+qmi_param_append (param,QMI_WDS_PARAM_USERNAME , +strlen (ctx->username), ctx->username); + }
No {} needed here. So please remove them. And that would be more consistent with the password handling below.
drivers/qmimodem/gprs-context.c static void qmi_activate_primary(struct ofono_gprs_context *gc, · line 201
Quoted 2 lines
drivers/qmimodem/gprs-context.c +2
-0+ +if (ctx->password &&strlen (ctx->password))
Same comment as above:
if (ctx->password[0] != '\0')
....
Quoted 15 lines
drivers/qmimodem/gprs-context.c +3
-0+qmi_param_append (param,QMI_WDS_PARAM_PASSWORD , +strlen (ctx->password), ctx->password); +if (qmi_service_send (data->wds,QMI_WDS_START_NET , param, start_net_cb, cbd,NULL ) >0 )return ;drivers/qmimodem/wds.h +0
-0@@ -30,6 +30,13 @@/* Start WDS network interface */ #define QMI_WDS_PARAM_APN 0x14/* string */ #define QMI_WDS_PARAM_IP_FAMILY 0x19/* uint8 */
drivers/qmimodem/wds.h line 42
Quoted 10 lines
drivers/qmimodem/wds.h +7
-0+#define QMI_WDS_PARAM_USERNAME 0x17/* string */ +#define QMI_WDS_PARAM_PASSWORD 0x18/* string */ +#define QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE 0x16/* uint8 */ + +#define QMI_WDS_AUTHENTICATION_NONE 0x0 +#define QMI_WDS_AUTHENTICATION_PAP 0x1 +#define QMI_WDS_AUTHENTICATION_CHAP 0x2#define QMI_WDS_RESULT_PKT_HANDLE 0x01/* uint32 */
Regards,
-Denis
PATCH 1/1 qmimodem: send authentication credentials
Pass authentication method, user and password
to QMI WDS service.
--- drivers/qmimodem/gprs-context.c | 24 ++++++++++++++++++++++++ drivers/qmimodem/wds.h | 7 +++++++ 2 files changed, 31 insertions(+)
drivers/qmimodem/gprs-context.c +24 -0
@@ -151,6 +151,7 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc,struct cb_data *cbd =cb_data_new (cb, user_data);struct qmi_param *param;uint8_t ip_family; +uint8_t auth;DBG ("cid %u" , ctx->cid);
@@ -178,6 +179,29 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc,qmi_param_append_uint8 (param,QMI_WDS_PARAM_IP_FAMILY , ip_family); +switch (ctx->auth_method) { +case OFONO_GPRS_AUTH_METHOD_CHAP : + auth =QMI_WDS_AUTHENTICATION_CHAP ; +break ; +case OFONO_GPRS_AUTH_METHOD_PAP : + auth =QMI_WDS_AUTHENTICATION_PAP ; +break ; +default : + auth =QMI_WDS_AUTHENTICATION_NONE ; +break ; + } +qmi_param_append_uint8 (param,QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE , + auth); + +if (ctx->username &&strlen (ctx->username)) { +qmi_param_append (param,QMI_WDS_PARAM_USERNAME , +strlen (ctx->username), ctx->username); + } + +if (ctx->password &&strlen (ctx->password)) +qmi_param_append (param,QMI_WDS_PARAM_PASSWORD , +strlen (ctx->password), ctx->password); +if (qmi_service_send (data->wds,QMI_WDS_START_NET , param, start_net_cb, cbd,NULL ) >0 )return ;
drivers/qmimodem/wds.h +7 -0
@@ -30,6 +30,13 @@/* Start WDS network interface */ #define QMI_WDS_PARAM_APN 0x14/* string */ #define QMI_WDS_PARAM_IP_FAMILY 0x19/* uint8 */ +#define QMI_WDS_PARAM_USERNAME 0x17/* string */ +#define QMI_WDS_PARAM_PASSWORD 0x18/* string */ +#define QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE 0x16/* uint8 */ + +#define QMI_WDS_AUTHENTICATION_NONE 0x0 +#define QMI_WDS_AUTHENTICATION_PAP 0x1 +#define QMI_WDS_AUTHENTICATION_CHAP 0x2#define QMI_WDS_RESULT_PKT_HANDLE 0x01/* uint32 */
Signature · 1 line
2.11.0
PATCH v2 1/1 qmimodem: send authentication credentials
In reply to Denis KenziorPass authentication method, user and password
to QMI WDS service.
--- drivers/qmimodem/gprs-context.c | 24 ++++++++++++++++++++++++ drivers/qmimodem/wds.h | 7 +++++++ 2 files changed, 31 insertions(+)
drivers/qmimodem/gprs-context.c +24 -0
@@ -151,6 +151,7 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc,struct cb_data *cbd =cb_data_new (cb, user_data);struct qmi_param *param;uint8_t ip_family; +uint8_t auth;DBG ("cid %u" , ctx->cid);
@@ -178,6 +179,29 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc,qmi_param_append_uint8 (param,QMI_WDS_PARAM_IP_FAMILY , ip_family); +switch (ctx->auth_method) { +case OFONO_GPRS_AUTH_METHOD_CHAP : + auth =QMI_WDS_AUTHENTICATION_CHAP ; +break ; +case OFONO_GPRS_AUTH_METHOD_PAP : + auth =QMI_WDS_AUTHENTICATION_PAP ; +break ; +default : + auth =QMI_WDS_AUTHENTICATION_NONE ; +break ; + } + +qmi_param_append_uint8 (param,QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE , + auth); + +if (ctx->username[0 ] !='\0' ) +qmi_param_append (param,QMI_WDS_PARAM_USERNAME , +strlen (ctx->username), ctx->username); + +if (ctx->password[0 ] !='\0' ) +qmi_param_append (param,QMI_WDS_PARAM_PASSWORD , +strlen (ctx->password), ctx->password); +if (qmi_service_send (data->wds,QMI_WDS_START_NET , param, start_net_cb, cbd,NULL ) >0 )return ;
drivers/qmimodem/wds.h +7 -0
@@ -30,6 +30,13 @@/* Start WDS network interface */ #define QMI_WDS_PARAM_APN 0x14/* string */ #define QMI_WDS_PARAM_IP_FAMILY 0x19/* uint8 */ +#define QMI_WDS_PARAM_USERNAME 0x17/* string */ +#define QMI_WDS_PARAM_PASSWORD 0x18/* string */ +#define QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE 0x16/* uint8 */ + +#define QMI_WDS_AUTHENTICATION_NONE 0x0 +#define QMI_WDS_AUTHENTICATION_PAP 0x1 +#define QMI_WDS_AUTHENTICATION_CHAP 0x2#define QMI_WDS_RESULT_PKT_HANDLE 0x01/* uint32 */
Signature · 1 line
2.11.0
Denis Kenzior
AppliedHi Piotr,
Quoted 7 lines · Piotr Haber
Pass authentication method, user and password
to QMI WDS service.--- drivers/qmimodem/gprs-context.c | 24 ++++++++++++++++++++++++ drivers/qmimodem/wds.h | 7 +++++++ 2 files changed, 31 insertions(+)
Applied, thanks.
Regards,
-Denis