diff -r aed141accdd9 -r a8c6460d612b lm_ssl.c --- a/lm_ssl.c Mon Feb 23 19:19:13 2009 +0200 +++ b/lm_ssl.c Sun Mar 08 00:48:19 2009 +0200 @@ -16,7 +16,7 @@ /// ssl status /// String, representing what problem have current ssl session. /// G: -const string2enum_t llm_ssl_status[] = { +const string2enum_t status_lm_ssl[] = { { "no cert found", LM_SSL_STATUS_NO_CERT_FOUND }, { "untrusted cert", LM_SSL_STATUS_UNTRUSTED_CERT }, { "cert expired", LM_SSL_STATUS_CERT_EXPIRED }, @@ -33,13 +33,13 @@ /// though, with upvalues it is not required. /// A: lm ssl object, ssl status /// R: boolean (false if connection process should be terminated) -LmSSLResponse llm_ssl_callback (LmSSL *ssl, LmSSLStatus status, llm_callback_t *cb) +LmSSLResponse callback_lm_ssl (LmSSL *ssl, LmSSLStatus status, llm_callback_t *cb) { int ret; lua_rawgeti (cb->L, LUA_REGISTRYINDEX, cb->reference); - llm_ssl_bless (cb->L, ssl); + bless_lm_ssl (cb->L, ssl); // XXX lm_ssl_unref (ssl); - luaL_pushenum (cb->L, status, llm_ssl_status); + luaL_pushenum (cb->L, status, status_lm_ssl); if (lua_pcall (cb->L, 2, 0, 0)) { W ("SSL callback error: %s", lua_tostring (cb->L, -1)); lua_pop (cb->L, 1); @@ -70,7 +70,7 @@ /// SSL fingerprint is a string like '01:23:45:67:89:AB:CD:EF:FE:DC:BA:98:76:54:32:10'. /// A: string (optional ssl fingerprint), ssl callback function (optional) /// R: lm ssl object -static int llm_ssl_new (lua_State *L) +static int new_lm_ssl (lua_State *L) { int args = lua_gettop (L); LmSSL *ssl; @@ -99,10 +99,10 @@ cb->reference = luaL_ref (L, LUA_REGISTRYINDEX); cb->L = L; - ssl = lm_ssl_new ((args > 1) ? buffer : NULL, (LmSSLFunction)llm_ssl_callback, + ssl = lm_ssl_new ((args > 1) ? buffer : NULL, (LmSSLFunction)callback_lm_ssl, cb, (GDestroyNotify)llm_callback_destroy); } - llm_ssl_bless (L, ssl); + bless_lm_ssl (L, ssl); lm_ssl_unref (ssl); // XXX D ("SSL %X created", (int) ssl); return 1; @@ -112,17 +112,17 @@ /// Blesses given pointer to lm ssl object. /// A: lightuserdata (C lm ssl object) /// R: lm ssl object -static int llm_ssl_bless_lua (lua_State *L) +static int bless_lua_lm_ssl (lua_State *L) { luaL_argcheck (L, lua_islightuserdata (L, 1), 1, "lm ssl lightuserdata expected"); - llm_ssl_bless (L, lua_touserdata (L, 1)); + bless_lm_ssl (L, lua_touserdata (L, 1)); return 1; } /// lm.ssl.supported /// Indicates if SSL is supported by loudmouth library. /// R: boolean -static int llm_ssl_supported (lua_State *L) +static int supported_lm_ssl (lua_State *L) { lua_pushboolean (L, lm_ssl_is_supported ()); return 1; @@ -131,7 +131,7 @@ /// ssl:fingerprint /// Returns fingerprint of remote server. /// R: string or nil -static int llm_ssl_fingerprint (lua_State *L) +static int fingerprint_lm_ssl (lua_State *L) { char buffer[48]; llm_ssl_t *object = luaL_checklm_ssl (L, 1); @@ -154,14 +154,14 @@ /// ssl:pointer /// Returns pointer to underlying C structure. /// R: lightuserdata -static int llm_ssl_pointer (lua_State *L) +static int pointer_lm_ssl (lua_State *L) { llm_ssl_t *object = luaL_checklm_ssl (L, 1); lua_pushlightuserdata (L, object->ssl); return 1; } -static int llm_ssl_gc (lua_State *L) +static int gc_lm_ssl (lua_State *L) { llm_ssl_t *object = luaL_checklm_ssl (L, 1); D ("SSL %X gc called", (int) object); @@ -169,17 +169,17 @@ return 0; } -const static luaL_Reg llm_ssl_reg_f[] = { - { "new", llm_ssl_new }, - { "bless", llm_ssl_bless_lua }, - { "supported", llm_ssl_supported }, +const static luaL_Reg reg_f_lm_ssl[] = { + { "new", new_lm_ssl }, + { "bless", bless_lua_lm_ssl }, + { "supported", supported_lm_ssl }, { NULL, NULL }, }; -const static luaL_Reg llm_ssl_reg_m[] = { - { "fingerprint", llm_ssl_fingerprint }, - { "pointer", llm_ssl_pointer }, - { "__gc", llm_ssl_gc }, +const static luaL_Reg reg_m_lm_ssl[] = { + { "fingerprint", fingerprint_lm_ssl }, + { "pointer", pointer_lm_ssl }, + { "__gc", gc_lm_ssl }, { NULL, NULL }, }; @@ -189,9 +189,9 @@ lua_pushstring (L, "__index"); lua_pushvalue (L, -2); lua_settable (L, -3); - luaL_register (L, NULL, llm_ssl_reg_m); + luaL_register (L, NULL, reg_m_lm_ssl); lua_pop (L, 1); - luaL_register (L, "lm.ssl", llm_ssl_reg_f); + luaL_register (L, "lm.ssl", reg_f_lm_ssl); return 1; }