litle fix for iar

projects/iar/bt-670x.ewp

@@ -336,6 +336,7 @@
           <state>$PROJ_DIR$\..\..\modules\STM32F4x7_ETH_Driver</state>
           <state>$PROJ_DIR$\..\..\modules\log</state>
           <state>$PROJ_DIR$\..\..\modules\testing</state>
+          <state>$PROJ_DIR$\..\..\modules\radius</state>
           <state>$PROJ_DIR$\..\..\thirdparty\FreeRTOS\include</state>
           <state>$PROJ_DIR$\..\..\thirdparty\FreeRTOS\portable\IAR\ARM_CM4F</state>
           <state>$PROJ_DIR$\..\..\thirdparty\lwip\src\include</state>

thirdparty/FreeRadius/include/freeradius-client.h

@@ -468,7 +468,7 @@ void rc_avpair_free(VALUE_PAIR *);
 int rc_avpair_parse(rc_handle const *, char const *, VALUE_PAIR **);
 int rc_avpair_tostr(rc_handle const *, VALUE_PAIR *, char *, int, char *, int);
 char *rc_avpair_log(rc_handle const *, VALUE_PAIR *, char *buf, size_t buf_len);
-VALUE_PAIR *rc_avpair_readin(rc_handle const *, FILE *);
+//VALUE_PAIR *rc_avpair_readin(rc_handle const *, FILE *);
 
 /* buildreq.c */
 
@@ -540,7 +540,7 @@ void rc_mdelay(int);
 char *rc_mksid(rc_handle *);
 rc_handle *rc_new(void);
 void rc_destroy(rc_handle *);
-char *rc_fgetln(FILE *, size_t *);
+//char *rc_fgetln(FILE *, size_t *);
 double rc_getctime(void);
 
 /* env.c */

thirdparty/FreeRadius/radius_user.c

@@ -1,212 +0,0 @@
-/********************************* (C) РОТЕК ***********************************
- * @module  template
- * @file    template.c
- * @version 1.0.0
- * @date    XX.XX.XXXX
- * $brief   template
- *******************************************************************************
- * @history     Version  Author         Comment
- * XX.XX.XXXX   1.0.0    Telenkov D.A.  First release.
- *******************************************************************************
- */
-
-#include "stm32f4xx.h"  
-#include "radius_user.h"
-
-#include "FreeRTOS.h"
-#include "task.h"
-
-#include "freeradius-client.h"
-#include "options.h"
-
-rc_handle	rcHandle;
-
-int auth_order = AUTH_LOCAL_SND;
-int login_tries = 4;
-int login_timeout = 60;
-char* nologin = "?";
-char* issue = "?";
-char* authserver = "192.168.1.2:1645";
-char* acctserver = "0";
-char* servers = "?";
-char* dictionary = "?";
-char *login_radius = "?";
-char *mapfile = "?";
-char *default_realm = NULL;
-int radius_timeout = 10;
-int radius_retries = 3;
-int radius_deadtime = 0;
-char *bindaddr = "*";
-char *login_local = "?";
-
-OPTION      rcOptions[] = {
-{"auth_order",	 	OT_AUO, ST_UNDEF, (void*)&auth_order}, // AUTH_LOCAL_FST AUTH_RADIUS_FST AUTH_LOCAL_SND AUTH_RADIUS_SND
-{"login_tries",	 	OT_INT, ST_UNDEF, (void*)&login_tries},
-{"login_timeout",	OT_INT, ST_UNDEF, (void*)&login_timeout},
-{"nologin",		    OT_STR, ST_UNDEF, NULL},
-{"issue",		    OT_STR, ST_UNDEF, NULL},
-// RADIUS specific options 
-{"authserver",		OT_SRV, ST_UNDEF, (void*)&authserver},
-{"acctserver",		OT_SRV, ST_UNDEF, (void*)&acctserver},
-{"servers",		    OT_STR, ST_UNDEF, (void*)&servers},
-{"dictionary",		OT_STR, ST_UNDEF, (void*)&dictionary},
-{"login_radius",	OT_STR, ST_UNDEF, (void*)&login_radius},
-{"mapfile",		    OT_STR, ST_UNDEF, (void*)&mapfile},
-{"default_realm",	OT_STR, ST_UNDEF, (void*)&default_realm},
-{"radius_timeout",	OT_INT, ST_UNDEF, (void*)&radius_timeout},
-{"radius_retries",	OT_INT,	ST_UNDEF, (void*)&radius_retries},
-{"radius_deadtime",	OT_INT, ST_UNDEF, (void*)&radius_deadtime},
-{"bindaddr",		OT_STR, ST_UNDEF, (void*)&bindaddr},
-// local options 
-{"login_local",		OT_STR, ST_UNDEF, (void*)&login_local},
-};
-
-DICT_ATTR   attr_1;
-DICT_ATTR   attr_2;
-DICT_ATTR   attr_3;
-
-
-/**
-  * @brief  
-  */
-int RD_TestInit(void)
-{
-    int         result;
-	char		username[128];
-	char        passwd[AUTH_PASS_LEN + 1];
-	VALUE_PAIR 	*send, *received;
-	uint32_t	service;
-	char 		msg[PW_MAX_MSG_SIZE], username_realm[256];
-	char		*default_realm;
-	  
-    // Моя подготовка 
-    memset(username, 0, 128);
-    memset(passwd, 0, AUTH_PASS_LEN + 1);
-    memset(msg, 0, PW_MAX_MSG_SIZE);
-    memset(username_realm, 0, 256);
-    
-    
-    // Просто копируем структуру настроек которая жесто задана
-    rc_read_config(&rcHandle);
-   
-    // Словарь пока опускаем и не инициализируем
-    //if (rc_read_dictionary(&rcHandle, rc_conf_str(&rcHandle, "dictionary")) != 0)
-	//	return ERROR_RC;
-  
-    // Заполняем словарь
-    // 1. User name
-    strcpy(attr_1.name, "test1");
-    attr_1.value = 1;
-    attr_1.type = PW_TYPE_STRING;
-    attr_1.next = NULL;
-    
-    // 2. Password
-    strcpy(attr_2.name, "12345");
-    attr_2.value = 2;
-    attr_2.type = PW_TYPE_STRING;
-    attr_2.next = &attr_1;
-    
-    // 2. Service type
-    //strcpy(attr_3.name, "Service-Type");
-    //attr_3.value = 6;
-    //attr_3.type = PW_TYPE_INTEGER;
-    //attr_3.next = &attr_2;
-    //strcpy(attr_3.name, "ervice-Type");
-    attr_3.value = 244;
-    attr_3.type = PW_TYPE_STRING;
-    attr_3.next = &attr_2;
-    
-    rcHandle.dictionary_attributes = &attr_3;
-    
-    // Не понял что за параметра, пока NULL
-    //default_realm = rc_conf_str(rh, "default_realm");
-    default_realm = NULL;
-
-    // Рараметры ожидаются от пользователя
-    //strncpy(username, "dtelenkov", 9);
-    strncpy(username, "test1", 5);
-    strncpy(passwd, "12345", 5);
-    //strncpy(username, rc_getstr (rh, "login: ",1), sizeof(username));
-	//strncpy (passwd, rc_getstr(rh, "Password: ",0), sizeof (passwd));
-    
-    send = NULL;
-        
-    /*
-	 * Fill in User-Name
-	 */
-
-	strncpy(username_realm, username, sizeof(username_realm));
-
-	/* Append default realm */
-    /*
-	if ((strchr(username_realm, '@') == NULL) && default_realm &&
-	    (*default_realm != '\0'))
-	{
-		strncat(username_realm, "@", sizeof(username_realm)-strlen(username_realm)-1);
-		strncat(username_realm, default_realm, sizeof(username_realm)-strlen(username_realm)-1);
-	}
-    */
-    
-	if (rc_avpair_add(&rcHandle, &send, PW_USER_NAME, username_realm, -1, 0) == NULL)
-		return ERROR_RC;
-    
-	/*
-	 * Fill in User-Password
-	 */
-	if (rc_avpair_add(&rcHandle, &send, PW_USER_PASSWORD, passwd, -1, 0) == NULL)
-		return ERROR_RC;
-
-	/*
-	 * Fill in Service-Type
-	 */
-	service = PW_AUTHENTICATE_ONLY;
-	if (rc_avpair_add(&rcHandle, &send, PW_SERVICE_TYPE, &service, -1, 0) == NULL)
-		return ERROR_RC;
-#if 1
-	result = rc_auth(&rcHandle, 0, send, &received, msg);
-
-	if (result == OK_RC)
-	{
-		fprintf(stderr, "\"%s\" RADIUS Authentication OK\n", username);
-	}
-	else
-	{
-		fprintf(stderr, "\"%s\" RADIUS Authentication failure (RC=%i)\n", username, result);
-	}
-
-	
-#endif
-	send = NULL;
-    
-    return 0;
-}
-
-void initFdsets(fdsets *sets)
-{
-    memset((sets)->buf1, 0xab, 8); 
-    memset((sets)->buf2, 0xab, 8); 
-    memset((sets)->buf3, 0xab, 8); 
-    memset((sets)->buf4, 0xab, 8); 
-}
-
-bool recvSelect(fdsets *sets, int *socket, uint32_t timeout)
-{
-    struct timeval tv;
-
-    tv.tv_sec = 0;
-    tv.tv_usec = timeout * 1000;
-      
-    FD_ZERO(&(sets->readset));
-    FD_SET(*socket, &sets->readset);
-    FD_ZERO(&sets->errset);
-    FD_SET(*socket, &sets->errset);
-        
-    lwip_select(*socket + 1, &sets->readset, NULL, &sets->errset, &tv);
-        
-    if (FD_ISSET(*socket, &sets->readset)) 
-        return true;
-
-    return false;
-}
-
-/********************************* (C) РОТЕК **********************************/

thirdparty/FreeRadius/radius_user.h

@@ -1,44 +0,0 @@
-/******************************* (C) LiteMesh **********************************
- * @module  template
- * @file    template.h
- * @version 1.0.0
- * @date    XX.XX.XXXX
- * $brief   template
- *******************************************************************************
- * @history     Version  Author         Comment
- * XX.XX.XXXX   1.0.0    Telenkov D.A.  First release.
- *******************************************************************************
- */
-
-/* Define to prevent recursive  ----------------------------------------------*/
-#ifndef __RADIUS_USER_H
-#define __RADIUS_USER_H
-
-#include "lwip/sockets.h"
-#include <stdbool.h>
-
-
-typedef struct 
-{
-    u8_t   buf1[8];
-    fd_set readset;
-    u8_t   buf2[8];
-    fd_set writeset;
-    u8_t   buf3[8];
-    fd_set errset;
-    u8_t   buf4[8];
-  
-} fdsets;
-
-/**
-  * @brief  
-  */
-int RD_TestInit(void);
-
-void initFdsets(fdsets *sets);
-
-bool recvSelect(fdsets *sets, int *socket, uint32_t timeout);
-
-#endif /* #ifndef __RADIUS_USER_H */
-
-/****************************** (C) LiteMesh ***************** end of file ****/