X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=b0eb42a9bc1f185e024cbd37c014ecacf78a5504;hb=ce80b78096596740cecfdae20d72d12accfa495e;hp=2a10babd22f4601f0fd9e8e5742737b55bb7a8cd;hpb=f75c35bdf5e2c6c1104c22c32bd0d55ca16b52c9;p=tpg%2Fopendispense2.git

diff --git a/src/server/server.c b/src/server/server.c
index 2a10bab..b0eb42a 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -18,10 +18,6 @@
 #include <limits.h>
 #include <stdarg.h>
 
-// HACKS
-#define HACK_TPG_NOAUTH	1
-#define HACK_ROOT_NOAUTH	1
-
 #define	DEBUG_TRACE_CLIENT	0
 
 // Statistics
@@ -45,6 +41,7 @@ typedef struct sClient
 	char	Salt[9];
 	
 	 int	UID;
+	 int	EffectiveUID;
 	 int	bIsAuthed;
 }	tClient;
 
@@ -57,6 +54,7 @@ void	Server_ParseClientCommand(tClient *Client, char *CommandString);
 void	Server_Cmd_USER(tClient *Client, char *Args);
 void	Server_Cmd_PASS(tClient *Client, char *Args);
 void	Server_Cmd_AUTOAUTH(tClient *Client, char *Args);
+void	Server_Cmd_SETEUSER(tClient *Client, char *Args);
 void	Server_Cmd_ENUMITEMS(tClient *Client, char *Args);
 void	Server_Cmd_ITEMINFO(tClient *Client, char *Args);
 void	Server_Cmd_DISPENSE(tClient *Client, char *Args);
@@ -69,20 +67,17 @@ void	Server_Cmd_USERADD(tClient *Client, char *Args);
 void	Server_Cmd_USERFLAGS(tClient *Client, char *Args);
 // --- Helpers ---
  int	sendf(int Socket, const char *Format, ...);
- int	GetUserAuth(const char *Salt, const char *Username, const uint8_t *Hash);
-void	HexBin(uint8_t *Dest, char *Src, int BufSize);
 
-// === GLOBALS ===
- int	giServer_Port = 1020;
- int	giServer_NextClientID = 1;
+// === CONSTANTS ===
 // - Commands
-struct sClientCommand {
-	char	*Name;
+const struct sClientCommand {
+	const char	*Name;
 	void	(*Function)(tClient *Client, char *Arguments);
 }	gaServer_Commands[] = {
 	{"USER", Server_Cmd_USER},
 	{"PASS", Server_Cmd_PASS},
 	{"AUTOAUTH", Server_Cmd_AUTOAUTH},
+	{"SETEUSER", Server_Cmd_SETEUSER},
 	{"ENUM_ITEMS", Server_Cmd_ENUMITEMS},
 	{"ITEM_INFO", Server_Cmd_ITEMINFO},
 	{"DISPENSE", Server_Cmd_DISPENSE},
@@ -93,7 +88,11 @@ struct sClientCommand {
 	{"USER_ADD", Server_Cmd_USERADD},
 	{"USER_FLAGS", Server_Cmd_USERFLAGS}
 };
-#define NUM_COMMANDS	(sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0]))
+#define NUM_COMMANDS	((int)(sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0])))
+
+// === GLOBALS ===
+ int	giServer_Port = 1020;
+ int	giServer_NextClientID = 1;
  int	giServer_Socket;
 
 // === CODE ===
@@ -195,7 +194,9 @@ void Server_HandleClient(int Socket, int bTrusted)
 	char	*buf = inbuf;
 	 int	remspace = INPUT_BUFFER_SIZE-1;
 	 int	bytes = -1;
-	tClient	clientInfo = {0};
+	tClient	clientInfo;
+	
+	memset(&clientInfo, 0, sizeof(clientInfo));
 	
 	// Initialise Client info
 	clientInfo.Socket = Socket;
@@ -321,7 +322,10 @@ void Server_ParseClientCommand(tClient *Client, char *CommandString)
  * Usage: USER <username>
  */
 void Server_Cmd_USER(tClient *Client, char *Args)
-{	
+{
+	char	*space = strchr(Args, ' ');
+	if(space)	*space = '\0';	// Remove characters after the ' '
+	
 	// Debug!
 	if( giDebugLevel )
 		printf("Client %i authenticating as '%s'\n", Client->ID, Args);
@@ -357,28 +361,17 @@ void Server_Cmd_USER(tClient *Client, char *Args)
  */
 void Server_Cmd_PASS(tClient *Client, char *Args)
 {
-	uint8_t	clienthash[HASH_LENGTH] = {0};
-	
-	// Read user's hash
-	HexBin(clienthash, Args, HASH_LENGTH);
+	char	*space = strchr(Args, ' ');
+	if(space)	*space = '\0';	// Remove characters after the ' '
 	
-	// TODO: Decrypt password passed
-	
-	Client->UID = GetUserAuth(Client->Salt, Client->Username, clienthash);
+	// Pass on to cokebank
+	Client->UID = Bank_GetUserAuth(Client->Salt, Client->Username, Args);
 
 	if( Client->UID != -1 ) {
 		Client->bIsAuthed = 1;
 		sendf(Client->Socket, "200 Auth OK\n");
 		return ;
 	}
-
-	if( giDebugLevel ) {
-		 int	i;
-		printf("Client %i: Password hash ", Client->ID);
-		for(i=0;i<HASH_LENGTH;i++)
-			printf("%02x", clienthash[i]&0xFF);
-		printf("\n");
-	}
 	
 	sendf(Client->Socket, "401 Auth Failure\n");
 }
@@ -390,8 +383,8 @@ void Server_Cmd_PASS(tClient *Client, char *Args)
  */
 void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
 {
-	char	*spos = strchr(Args, ' ');
-	if(spos)	*spos = '\0';	// Remove characters after the ' '
+	char	*space = strchr(Args, ' ');
+	if(space)	*space = '\0';	// Remove characters after the ' '
 	
 	// Check if trusted
 	if( !Client->bIsTrusted ) {
@@ -402,7 +395,7 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
 	}
 	
 	// Get UID
-	Client->UID = GetUserID( Args );	
+	Client->UID = Bank_GetUserID( Args );	
 	if( Client->UID < 0 ) {
 		if(giDebugLevel)
 			printf("Client %i: Unknown user '%s'\n", Client->ID, Args);
@@ -410,12 +403,58 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
 		return ;
 	}
 	
+	// You can't be an internal account
+	if( Bank_GetFlags(Client->UID) & USER_FLAG_INTERNAL ) {
+		Client->UID = -1;
+		sendf(Client->Socket, "401 Auth Failure\n");
+		return ;
+	}
+	
 	if(giDebugLevel)
 		printf("Client %i: Authenticated as '%s' (%i)\n", Client->ID, Args, Client->UID);
 	
 	sendf(Client->Socket, "200 Auth OK\n");
 }
 
+/**
+ * \brief Set effective user
+ */
+void Server_Cmd_SETEUSER(tClient *Client, char *Args)
+{
+	char	*space;
+	
+	space = strchr(Args, ' ');
+	
+	if(space)	*space = '\0';
+	
+	if( !strlen(Args) ) {
+		sendf(Client->Socket, "407 SETEUSER expects an argument\n");
+		return ;
+	}
+
+	// Check user permissions
+	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_COKE) ) {
+		sendf(Client->Socket, "403 Not in coke\n");
+		return ;
+	}
+	
+	// Set id
+	Client->EffectiveUID = Bank_GetUserID(Args);
+	if( Client->EffectiveUID == -1 ) {
+		sendf(Client->Socket, "404 User not found\n");
+		return ;
+	}
+	
+	// You can't be an internal account
+	if( Bank_GetFlags(Client->EffectiveUID) & USER_FLAG_INTERNAL ) {
+		Client->EffectiveUID = -1;
+		sendf(Client->Socket, "404 User not found\n");
+		return ;
+	}
+	
+	sendf(Client->Socket, "200 User set\n");
+}
+
 /**
  * \brief Enumerate the items that the server knows about
  */
@@ -423,6 +462,11 @@ void Server_Cmd_ENUMITEMS(tClient *Client, char *Args)
 {
 	 int	i;
 
+	if( Args != NULL && strlen(Args) ) {
+		sendf(Client->Socket, "407 ENUM_ITEMS takes no arguments\n");
+		return ;
+	}
+
 	sendf(Client->Socket, "201 Items %i\n", giNumItems);
 
 	for( i = 0; i < giNumItems; i ++ ) {
@@ -494,6 +538,8 @@ void Server_Cmd_DISPENSE(tClient *Client, char *Args)
 {
 	tItem	*item;
 	 int	ret;
+	 int	uid;
+	 
 	if( !Client->bIsAuthed ) {
 		sendf(Client->Socket, "401 Not Authenticated\n");
 		return ;
@@ -504,8 +550,15 @@ void Server_Cmd_DISPENSE(tClient *Client, char *Args)
 		sendf(Client->Socket, "406 Bad Item ID\n");
 		return ;
 	}
+	
+	if( Client->EffectiveUID != -1 ) {
+		uid = Client->EffectiveUID;
+	}
+	else {
+		uid = Client->UID;
+	}
 
-	switch( ret = DispenseItem( Client->UID, item ) )
+	switch( ret = DispenseItem( Client->UID, uid, item ) )
 	{
 	case 0:	sendf(Client->Socket, "200 Dispense OK\n");	return ;
 	case 1:	sendf(Client->Socket, "501 Unable to dispense\n");	return ;
@@ -520,6 +573,7 @@ void Server_Cmd_GIVE(tClient *Client, char *Args)
 {
 	char	*recipient, *ammount, *reason;
 	 int	uid, iAmmount;
+	 int	thisUid;
 	
 	if( !Client->bIsAuthed ) {
 		sendf(Client->Socket, "401 Not Authenticated\n");
@@ -545,11 +599,17 @@ void Server_Cmd_GIVE(tClient *Client, char *Args)
 	reason ++;
 
 	// Get recipient
-	uid = GetUserID(recipient);
+	uid = Bank_GetUserID(recipient);
 	if( uid == -1 ) {
 		sendf(Client->Socket, "404 Invalid target user\n");
 		return ;
 	}
+	
+	// You can't alter an internal account
+	if( Bank_GetFlags(uid) & USER_FLAG_INTERNAL ) {
+		sendf(Client->Socket, "404 Invalid target user\n");
+		return ;
+	}
 
 	// Parse ammount
 	iAmmount = atoi(ammount);
@@ -557,9 +617,16 @@ void Server_Cmd_GIVE(tClient *Client, char *Args)
 		sendf(Client->Socket, "407 Invalid Argument, ammount must be > zero\n");
 		return ;
 	}
+	
+	if( Client->EffectiveUID != -1 ) {
+		thisUid = Client->EffectiveUID;
+	}
+	else {
+		thisUid = Client->UID;
+	}
 
 	// Do give
-	switch( DispenseGive(Client->UID, uid, iAmmount, reason) )
+	switch( DispenseGive(Client->UID, thisUid, uid, iAmmount, reason) )
 	{
 	case 0:
 		sendf(Client->Socket, "200 Give OK\n");
@@ -601,18 +668,24 @@ void Server_Cmd_ADD(tClient *Client, char *Args)
 	*reason = '\0';
 	reason ++;
 
-	// TODO: Check if the current user is in coke/higher
-	if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_COKE ) {
+	// Check user permissions
+	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_COKE)  ) {
 		sendf(Client->Socket, "403 Not in coke\n");
 		return ;
 	}
 
 	// Get recipient
-	uid = GetUserID(user);
+	uid = Bank_GetUserID(user);
 	if( uid == -1 ) {
 		sendf(Client->Socket, "404 Invalid user\n");
 		return ;
 	}
+	
+	// You can't alter an internal account
+	if( Bank_GetFlags(uid) & USER_FLAG_INTERNAL ) {
+		sendf(Client->Socket, "404 Invalid user\n");
+		return ;
+	}
 
 	// Parse ammount
 	iAmmount = atoi(ammount);
@@ -640,7 +713,8 @@ void Server_Cmd_ENUMUSERS(tClient *Client, char *Args)
 {
 	 int	i, numRet = 0;
 	 int	maxBal = INT_MAX, minBal = INT_MIN;
-	 int	numUsr = GetMaxID();
+	tAcctIterator	*it;
+	 int	sort = BANK_ITFLAG_SORT_NAME;
 	
 	// Parse arguments
 	if( Args && strlen(Args) )
@@ -661,10 +735,18 @@ void Server_Cmd_ENUMUSERS(tClient *Client, char *Args)
 			maxBal = atoi(max);
 	}
 	
+	// Create iterator
+	if( maxBal != INT_MAX )
+		it = Bank_Iterator(0, 0, sort|BANK_ITFLAG_MAXBALANCE, maxBal, 0);
+	else if( minBal != INT_MIN )
+		it = Bank_Iterator(0, 0, sort|BANK_ITFLAG_MINBALANCE, minBal, 0);
+	else
+		it = Bank_Iterator(0, 0, sort, 0, 0);
+	
 	// Get return number
-	for( i = 0; i < numUsr; i ++ )
+	while( (i = Bank_IteratorNext(it)) != -1 )
 	{
-		int bal = GetBalance(i);
+		int bal = Bank_GetBalance(i);
 		
 		if( bal == INT_MIN )	continue;
 		
@@ -674,12 +756,23 @@ void Server_Cmd_ENUMUSERS(tClient *Client, char *Args)
 		numRet ++;
 	}
 	
+	Bank_DelIterator(it);
+	
 	// Send count
 	sendf(Client->Socket, "201 Users %i\n", numRet);
 	
-	for( i = 0; i < numUsr; i ++ )
+	
+	// Create iterator
+	if( maxBal != INT_MAX )
+		it = Bank_Iterator(0, 0, sort|BANK_ITFLAG_MAXBALANCE, maxBal, 0);
+	else if( minBal != INT_MIN )
+		it = Bank_Iterator(0, 0, sort|BANK_ITFLAG_MINBALANCE, minBal, 0);
+	else
+		it = Bank_Iterator(0, 0, sort, 0, 0);
+	
+	while( (i = Bank_IteratorNext(it)) != -1 )
 	{
-		int bal = GetBalance(i);
+		int bal = Bank_GetBalance(i);
 		
 		if( bal == INT_MIN )	continue;
 		
@@ -689,6 +782,8 @@ void Server_Cmd_ENUMUSERS(tClient *Client, char *Args)
 		_SendUserInfo(Client, i);
 	}
 	
+	Bank_DelIterator(it);
+	
 	sendf(Client->Socket, "200 List End\n");
 }
 
@@ -702,7 +797,7 @@ void Server_Cmd_USERINFO(tClient *Client, char *Args)
 	if(space)	*space = '\0';
 	
 	// Get recipient
-	uid = GetUserID(user);
+	uid = Bank_GetUserID(user);
 	if( uid == -1 ) {
 		sendf(Client->Socket, "404 Invalid user");
 		return ;
@@ -713,25 +808,34 @@ void Server_Cmd_USERINFO(tClient *Client, char *Args)
 
 void _SendUserInfo(tClient *Client, int UserID)
 {
-	char	*type, *disabled="";
-	 int	flags = GetFlags(UserID);
+	char	*type, *disabled="", *door="";
+	 int	flags = Bank_GetFlags(UserID);
 	
-	switch( flags & USER_FLAG_TYPEMASK )
-	{
-	default:
-	case USER_TYPE_NORMAL:	type = "user";	break;
-	case USER_TYPE_COKE:	type = "coke";	break;
-	case USER_TYPE_WHEEL:	type = "wheel";	break;
-	case USER_TYPE_GOD:	type = "meta";	break;
+	if( flags & USER_FLAG_INTERNAL ) {
+		type = "internal";
+	}
+	else if( flags & USER_FLAG_COKE ) {
+		if( flags & USER_FLAG_WHEEL )
+			type = "coke,wheel";
+		else
+			type = "coke";
+	}
+	else if( flags & USER_FLAG_WHEEL ) {
+		type = "wheel";
+	}
+	else {
+		type = "user";
 	}
 	
 	if( flags & USER_FLAG_DISABLED )
 		disabled = ",disabled";
+	if( flags & USER_FLAG_DOORGROUP )
+		door = ",door";
 	
 	// TODO: User flags/type
 	sendf(
 		Client->Socket, "202 User %s %i %s%s\n",
-		GetUserName(UserID), GetBalance(UserID),
+		Bank_GetUserName(UserID), Bank_GetBalance(UserID),
 		type, disabled
 		);
 }
@@ -741,7 +845,7 @@ void Server_Cmd_USERADD(tClient *Client, char *Args)
 	char	*username, *space;
 	
 	// Check permissions
-	if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_WHEEL ) {
+	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_WHEEL) ) {
 		sendf(Client->Socket, "403 Not Wheel\n");
 		return ;
 	}
@@ -753,7 +857,7 @@ void Server_Cmd_USERADD(tClient *Client, char *Args)
 	if(space)	*space = '\0';
 	
 	// Try to create user
-	if( CreateUser(username) == -1 ) {
+	if( Bank_CreateUser(username) == -1 ) {
 		sendf(Client->Socket, "404 User exists\n");
 		return ;
 	}
@@ -769,7 +873,7 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
 	 int	uid;
 	
 	// Check permissions
-	if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_WHEEL ) {
+	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_WHEEL) ) {
 		sendf(Client->Socket, "403 Not Wheel\n");
 		return ;
 	}
@@ -791,7 +895,7 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
 	if(space)	*space = '\0';
 	
 	// Get UID
-	uid = GetUserID(username);
+	uid = Bank_GetUserID(username);
 	if( uid == -1 ) {
 		sendf(Client->Socket, "404 User '%s' not found\n", username);
 		return ;
@@ -806,12 +910,11 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
 			 int	Mask;
 			 int	Value;
 		}	cFLAGS[] = {
-			{"disabled", USER_FLAG_DISABLED, USER_FLAG_DISABLED},
-			{"door", USER_FLAG_DOORGROUP, USER_FLAG_DOORGROUP},
-			{"user", USER_FLAG_TYPEMASK, USER_TYPE_NORMAL},
-			{"coke", USER_FLAG_TYPEMASK, USER_TYPE_COKE},
-			{"wheel", USER_FLAG_TYPEMASK, USER_TYPE_WHEEL},
-			{"meta", USER_FLAG_TYPEMASK, USER_TYPE_GOD}
+			 {"disabled", USER_FLAG_DISABLED, USER_FLAG_DISABLED}
+			,{"door", USER_FLAG_DOORGROUP, USER_FLAG_DOORGROUP}
+			,{"coke", USER_FLAG_COKE, USER_FLAG_COKE}
+			,{"wheel", USER_FLAG_WHEEL, USER_FLAG_WHEEL}
+		//	,{"internal", USER_FLAG_INTERNAL, USER_FLAG_INTERNAL}
 		};
 		const int	ciNumFlags = sizeof(cFLAGS)/sizeof(cFLAGS[0]);
 		
@@ -850,57 +953,12 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
 	} while(space);
 	
 	// Apply flags
-	SetFlags(uid, mask, value);
+	Bank_SetFlags(uid, mask, value);
 	
 	// Return OK
 	sendf(Client->Socket, "200 User Updated\n");
 }
 
-/**
- * \brief Authenticate a user
- * \return User ID, or -1 if authentication failed
- */
-int GetUserAuth(const char *Salt, const char *Username, const uint8_t *ProvidedHash)
-{
-	#if 0
-	uint8_t	h[20];
-	 int	ofs = strlen(Username) + strlen(Salt);
-	char	input[ ofs + 40 + 1];
-	char	tmp[4 + strlen(Username) + 1];	// uid=%s
-	#endif
-	
-	#if HACK_TPG_NOAUTH
-	if( strcmp(Username, "tpg") == 0 )
-		return GetUserID("tpg");
-	#endif
-	#if HACK_ROOT_NOAUTH
-	if( strcmp(Username, "root") == 0 ) {
-		int ret = GetUserID("root");
-		if( ret == -1 )
-			return CreateUser("root");
-		return ret;
-	}
-	#endif
-	
-	#if 0
-	//
-	strcpy(input, Username);
-	strcpy(input, Salt);
-	// TODO: Get user's SHA-1 hash
-	sprintf(tmp, "uid=%s", Username);
-	ldap_search_s(ld, "", LDAP_SCOPE_BASE, tmp, "userPassword", 0, res);
-	
-	sprintf(input+ofs, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-		h[ 0], h[ 1], h[ 2], h[ 3], h[ 4], h[ 5], h[ 6], h[ 7], h[ 8], h[ 9],
-		h[10], h[11], h[12], h[13], h[14], h[15], h[16], h[17], h[18], h[19]
-		);
-	// Then create the hash from the provided salt
-	// Compare that with the provided hash
-	#endif
-	
-	return -1;
-}
-
 // --- INTERNAL HELPERS ---
 int sendf(int Socket, const char *Format, ...)
 {
@@ -924,80 +982,3 @@ int sendf(int Socket, const char *Format, ...)
 		return send(Socket, buf, len, 0);
 	}
 }
-
-// TODO: Move to another file
-void HexBin(uint8_t *Dest, char *Src, int BufSize)
-{
-	 int	i;
-	for( i = 0; i < BufSize; i ++ )
-	{
-		uint8_t	val = 0;
-		
-		if('0' <= *Src && *Src <= '9')
-			val |= (*Src-'0') << 4;
-		else if('A' <= *Src && *Src <= 'F')
-			val |= (*Src-'A'+10) << 4;
-		else if('a' <= *Src && *Src <= 'f')
-			val |= (*Src-'a'+10) << 4;
-		else
-			break;
-		Src ++;
-		
-		if('0' <= *Src && *Src <= '9')
-			val |= (*Src-'0');
-		else if('A' <= *Src && *Src <= 'F')
-			val |= (*Src-'A'+10);
-		else if('a' <= *Src && *Src <= 'f')
-			val |= (*Src-'a'+10);
-		else
-			break;
-		Src ++;
-		
-		Dest[i] = val;
-	}
-	for( ; i < BufSize; i++ )
-		Dest[i] = 0;
-}
-
-/**
- * \brief Decode a Base64 value
- */
-int UnBase64(uint8_t *Dest, char *Src, int BufSize)
-{
-	uint32_t	val;
-	 int	i, j;
-	char	*start_src = Src;
-	
-	for( i = 0; i+2 < BufSize; i += 3 )
-	{
-		val = 0;
-		for( j = 0; j < 4; j++, Src ++ ) {
-			if('A' <= *Src && *Src <= 'Z')
-				val |= (*Src - 'A') << ((3-j)*6);
-			else if('a' <= *Src && *Src <= 'z')
-				val |= (*Src - 'a' + 26) << ((3-j)*6);
-			else if('0' <= *Src && *Src <= '9')
-				val |= (*Src - '0' + 52) << ((3-j)*6);
-			else if(*Src == '+')
-				val |= 62 << ((3-j)*6);
-			else if(*Src == '/')
-				val |= 63 << ((3-j)*6);
-			else if(!*Src)
-				break;
-			else if(*Src != '=')
-				j --;	// Ignore invalid characters
-		}
-		Dest[i  ] = (val >> 16) & 0xFF;
-		Dest[i+1] = (val >> 8) & 0xFF;
-		Dest[i+2] = val & 0xFF;
-		if(j != 4)	break;
-	}
-	
-	// Finish things off
-	if(i   < BufSize)
-		Dest[i] = (val >> 16) & 0xFF;
-	if(i+1 < BufSize)
-		Dest[i+1] = (val >> 8) & 0xFF;
-	
-	return Src - start_src;
-}