Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 891913 Details for
Bug 682382
hardcodes eth0
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Patch included in Fedora
0019-sys-linux-rework-get_first_ethernet.patch (text/plain), 27.97 KB, created by
Michal Sekletar
on 2014-05-02 15:02:47 UTC
(
hide
)
Description:
Patch included in Fedora
Filename:
MIME Type:
Creator:
Michal Sekletar
Created:
2014-05-02 15:02:47 UTC
Size:
27.97 KB
patch
obsolete
><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" > "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ><html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> ><head> ><title>ppp.git - ppp</title> ><meta name='generator' content='cgit v0.10.1'/> ><meta name='robots' content='index, nofollow'/> ><link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/> ><link rel='shortcut icon' href='/favicon.ico'/> ><link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/ppp.git/atom/0019-sys-linux-rework-get_first_ethernet.patch?h=master' type='application/atom+xml'/> ></head> ><body> ><div id='cgit'><table id='header'> ><tr> ><td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td> ><td class='main'><a href='/cgit/'>index</a> : <a title='ppp.git' href='/cgit/ppp.git/'>ppp.git</a></td><td class='form'><form method='get' action=''> ><select name='h' onchange='this.form.submit();'> ><option value='f10'>f10</option> ><option value='f11'>f11</option> ><option value='f12'>f12</option> ><option value='f13'>f13</option> ><option value='f14'>f14</option> ><option value='f15'>f15</option> ><option value='f16'>f16</option> ><option value='f17'>f17</option> ><option value='f18'>f18</option> ><option value='f19'>f19</option> ><option value='f20'>f20</option> ><option value='f7'>f7</option> ><option value='f8'>f8</option> ><option value='f9'>f9</option> ><option value='master' selected='selected'>master</option> ></select> <input type='submit' name='' value='switch'/></form></td></tr> ><tr><td class='sub'>ppp</td><td class='sub right'>Jesse Keating</td></tr></table> ><table class='tabs'><tr><td> ><a href='/cgit/ppp.git/'>summary</a><a href='/cgit/ppp.git/refs/'>refs</a><a href='/cgit/ppp.git/log/0019-sys-linux-rework-get_first_ethernet.patch'>log</a><a class='active' href='/cgit/ppp.git/tree/0019-sys-linux-rework-get_first_ethernet.patch'>tree</a><a href='/cgit/ppp.git/commit/0019-sys-linux-rework-get_first_ethernet.patch'>commit</a><a href='/cgit/ppp.git/diff/0019-sys-linux-rework-get_first_ethernet.patch'>diff</a><a href='/cgit/ppp.git/stats/0019-sys-linux-rework-get_first_ethernet.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/ppp.git/log/0019-sys-linux-rework-get_first_ethernet.patch'> ><select name='qt'> ><option value='grep'>log msg</option> ><option value='author'>author</option> ><option value='committer'>committer</option> ><option value='range'>range</option> ></select> ><input class='txt' type='text' size='10' name='q' value=''/> ><input type='submit' value='search'/> ></form> ></td></tr></table> ><div class='path'>path: <a href='/cgit/ppp.git/tree/'>root</a>/<a href='/cgit/ppp.git/tree/0019-sys-linux-rework-get_first_ethernet.patch'>0019-sys-linux-rework-get_first_ethernet.patch</a></div><div class='content'>blob: 28cae8ddd5d8bf7a4c2fe1cbaecda86c20033107 (<a href='/cgit/ppp.git/plain/0019-sys-linux-rework-get_first_ethernet.patch'>plain</a>) ><table summary='blob content' class='blob'> ><tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> ><a id='n2' href='#n2'>2</a> ><a id='n3' href='#n3'>3</a> ><a id='n4' href='#n4'>4</a> ><a id='n5' href='#n5'>5</a> ><a id='n6' href='#n6'>6</a> ><a id='n7' href='#n7'>7</a> ><a id='n8' href='#n8'>8</a> ><a id='n9' href='#n9'>9</a> ><a id='n10' href='#n10'>10</a> ><a id='n11' href='#n11'>11</a> ><a id='n12' href='#n12'>12</a> ><a id='n13' href='#n13'>13</a> ><a id='n14' href='#n14'>14</a> ><a id='n15' href='#n15'>15</a> ><a id='n16' href='#n16'>16</a> ><a id='n17' href='#n17'>17</a> ><a id='n18' href='#n18'>18</a> ><a id='n19' href='#n19'>19</a> ><a id='n20' href='#n20'>20</a> ><a id='n21' href='#n21'>21</a> ><a id='n22' href='#n22'>22</a> ><a id='n23' href='#n23'>23</a> ><a id='n24' href='#n24'>24</a> ><a id='n25' href='#n25'>25</a> ><a id='n26' href='#n26'>26</a> ><a id='n27' href='#n27'>27</a> ><a id='n28' href='#n28'>28</a> ><a id='n29' href='#n29'>29</a> ><a id='n30' href='#n30'>30</a> ><a id='n31' href='#n31'>31</a> ><a id='n32' href='#n32'>32</a> ><a id='n33' href='#n33'>33</a> ><a id='n34' href='#n34'>34</a> ><a id='n35' href='#n35'>35</a> ><a id='n36' href='#n36'>36</a> ><a id='n37' href='#n37'>37</a> ><a id='n38' href='#n38'>38</a> ><a id='n39' href='#n39'>39</a> ><a id='n40' href='#n40'>40</a> ><a id='n41' href='#n41'>41</a> ><a id='n42' href='#n42'>42</a> ><a id='n43' href='#n43'>43</a> ><a id='n44' href='#n44'>44</a> ><a id='n45' href='#n45'>45</a> ><a id='n46' href='#n46'>46</a> ><a id='n47' href='#n47'>47</a> ><a id='n48' href='#n48'>48</a> ><a id='n49' href='#n49'>49</a> ><a id='n50' href='#n50'>50</a> ><a id='n51' href='#n51'>51</a> ><a id='n52' href='#n52'>52</a> ><a id='n53' href='#n53'>53</a> ><a id='n54' href='#n54'>54</a> ><a id='n55' href='#n55'>55</a> ><a id='n56' href='#n56'>56</a> ><a id='n57' href='#n57'>57</a> ><a id='n58' href='#n58'>58</a> ><a id='n59' href='#n59'>59</a> ><a id='n60' href='#n60'>60</a> ><a id='n61' href='#n61'>61</a> ><a id='n62' href='#n62'>62</a> ><a id='n63' href='#n63'>63</a> ><a id='n64' href='#n64'>64</a> ><a id='n65' href='#n65'>65</a> ><a id='n66' href='#n66'>66</a> ><a id='n67' href='#n67'>67</a> ><a id='n68' href='#n68'>68</a> ><a id='n69' href='#n69'>69</a> ><a id='n70' href='#n70'>70</a> ><a id='n71' href='#n71'>71</a> ><a id='n72' href='#n72'>72</a> ><a id='n73' href='#n73'>73</a> ><a id='n74' href='#n74'>74</a> ><a id='n75' href='#n75'>75</a> ><a id='n76' href='#n76'>76</a> ><a id='n77' href='#n77'>77</a> ><a id='n78' href='#n78'>78</a> ><a id='n79' href='#n79'>79</a> ><a id='n80' href='#n80'>80</a> ><a id='n81' href='#n81'>81</a> ><a id='n82' href='#n82'>82</a> ><a id='n83' href='#n83'>83</a> ><a id='n84' href='#n84'>84</a> ><a id='n85' href='#n85'>85</a> ><a id='n86' href='#n86'>86</a> ><a id='n87' href='#n87'>87</a> ><a id='n88' href='#n88'>88</a> ><a id='n89' href='#n89'>89</a> ><a id='n90' href='#n90'>90</a> ><a id='n91' href='#n91'>91</a> ><a id='n92' href='#n92'>92</a> ><a id='n93' href='#n93'>93</a> ><a id='n94' href='#n94'>94</a> ><a id='n95' href='#n95'>95</a> ><a id='n96' href='#n96'>96</a> ><a id='n97' href='#n97'>97</a> ><a id='n98' href='#n98'>98</a> ><a id='n99' href='#n99'>99</a> ><a id='n100' href='#n100'>100</a> ><a id='n101' href='#n101'>101</a> ><a id='n102' href='#n102'>102</a> ><a id='n103' href='#n103'>103</a> ><a id='n104' href='#n104'>104</a> ><a id='n105' href='#n105'>105</a> ><a id='n106' href='#n106'>106</a> ><a id='n107' href='#n107'>107</a> ><a id='n108' href='#n108'>108</a> ><a id='n109' href='#n109'>109</a> ><a id='n110' href='#n110'>110</a> ><a id='n111' href='#n111'>111</a> ><a id='n112' href='#n112'>112</a> ><a id='n113' href='#n113'>113</a> ><a id='n114' href='#n114'>114</a> ><a id='n115' href='#n115'>115</a> ><a id='n116' href='#n116'>116</a> ><a id='n117' href='#n117'>117</a> ><a id='n118' href='#n118'>118</a> ><a id='n119' href='#n119'>119</a> ><a id='n120' href='#n120'>120</a> ><a id='n121' href='#n121'>121</a> ><a id='n122' href='#n122'>122</a> ><a id='n123' href='#n123'>123</a> ><a id='n124' href='#n124'>124</a> ><a id='n125' href='#n125'>125</a> ><a id='n126' href='#n126'>126</a> ><a id='n127' href='#n127'>127</a> ><a id='n128' href='#n128'>128</a> ><a id='n129' href='#n129'>129</a> ><a id='n130' href='#n130'>130</a> ><a id='n131' href='#n131'>131</a> ><a id='n132' href='#n132'>132</a> ><a id='n133' href='#n133'>133</a> ><a id='n134' href='#n134'>134</a> ><a id='n135' href='#n135'>135</a> ><a id='n136' href='#n136'>136</a> ><a id='n137' href='#n137'>137</a> ><a id='n138' href='#n138'>138</a> ><a id='n139' href='#n139'>139</a> ><a id='n140' href='#n140'>140</a> ><a id='n141' href='#n141'>141</a> ><a id='n142' href='#n142'>142</a> ><a id='n143' href='#n143'>143</a> ><a id='n144' href='#n144'>144</a> ><a id='n145' href='#n145'>145</a> ><a id='n146' href='#n146'>146</a> ><a id='n147' href='#n147'>147</a> ><a id='n148' href='#n148'>148</a> ><a id='n149' href='#n149'>149</a> ><a id='n150' href='#n150'>150</a> ><a id='n151' href='#n151'>151</a> ><a id='n152' href='#n152'>152</a> ><a id='n153' href='#n153'>153</a> ><a id='n154' href='#n154'>154</a> ><a id='n155' href='#n155'>155</a> ><a id='n156' href='#n156'>156</a> ><a id='n157' href='#n157'>157</a> ><a id='n158' href='#n158'>158</a> ><a id='n159' href='#n159'>159</a> ><a id='n160' href='#n160'>160</a> ><a id='n161' href='#n161'>161</a> ><a id='n162' href='#n162'>162</a> ><a id='n163' href='#n163'>163</a> ><a id='n164' href='#n164'>164</a> ><a id='n165' href='#n165'>165</a> ><a id='n166' href='#n166'>166</a> ><a id='n167' href='#n167'>167</a> ><a id='n168' href='#n168'>168</a> ><a id='n169' href='#n169'>169</a> ><a id='n170' href='#n170'>170</a> ><a id='n171' href='#n171'>171</a> ><a id='n172' href='#n172'>172</a> ><a id='n173' href='#n173'>173</a> ><a id='n174' href='#n174'>174</a> ><a id='n175' href='#n175'>175</a> ><a id='n176' href='#n176'>176</a> ><a id='n177' href='#n177'>177</a> ><a id='n178' href='#n178'>178</a> ><a id='n179' href='#n179'>179</a> ><a id='n180' href='#n180'>180</a> ><a id='n181' href='#n181'>181</a> ><a id='n182' href='#n182'>182</a> ><a id='n183' href='#n183'>183</a> ><a id='n184' href='#n184'>184</a> ><a id='n185' href='#n185'>185</a> ><a id='n186' href='#n186'>186</a> ><a id='n187' href='#n187'>187</a> ><a id='n188' href='#n188'>188</a> ><a id='n189' href='#n189'>189</a> ><a id='n190' href='#n190'>190</a> ><a id='n191' href='#n191'>191</a> ><a id='n192' href='#n192'>192</a> ><a id='n193' href='#n193'>193</a> ><a id='n194' href='#n194'>194</a> ><a id='n195' href='#n195'>195</a> ><a id='n196' href='#n196'>196</a> ><a id='n197' href='#n197'>197</a> ><a id='n198' href='#n198'>198</a> ><a id='n199' href='#n199'>199</a> ><a id='n200' href='#n200'>200</a> ><a id='n201' href='#n201'>201</a> ><a id='n202' href='#n202'>202</a> ><a id='n203' href='#n203'>203</a> ><a id='n204' href='#n204'>204</a> ><a id='n205' href='#n205'>205</a> ><a id='n206' href='#n206'>206</a> ><a id='n207' href='#n207'>207</a> ><a id='n208' href='#n208'>208</a> ><a id='n209' href='#n209'>209</a> ><a id='n210' href='#n210'>210</a> ><a id='n211' href='#n211'>211</a> ><a id='n212' href='#n212'>212</a> ><a id='n213' href='#n213'>213</a> ><a id='n214' href='#n214'>214</a> ><a id='n215' href='#n215'>215</a> ><a id='n216' href='#n216'>216</a> ><a id='n217' href='#n217'>217</a> ><a id='n218' href='#n218'>218</a> ><a id='n219' href='#n219'>219</a> ><a id='n220' href='#n220'>220</a> ><a id='n221' href='#n221'>221</a> ><a id='n222' href='#n222'>222</a> ><a id='n223' href='#n223'>223</a> ><a id='n224' href='#n224'>224</a> ><a id='n225' href='#n225'>225</a> ><a id='n226' href='#n226'>226</a> ><a id='n227' href='#n227'>227</a> ><a id='n228' href='#n228'>228</a> ><a id='n229' href='#n229'>229</a> ><a id='n230' href='#n230'>230</a> ><a id='n231' href='#n231'>231</a> ><a id='n232' href='#n232'>232</a> ><a id='n233' href='#n233'>233</a> ><a id='n234' href='#n234'>234</a> ><a id='n235' href='#n235'>235</a> ><a id='n236' href='#n236'>236</a> ><a id='n237' href='#n237'>237</a> ><a id='n238' href='#n238'>238</a> ><a id='n239' href='#n239'>239</a> ><a id='n240' href='#n240'>240</a> ><a id='n241' href='#n241'>241</a> ><a id='n242' href='#n242'>242</a> ><a id='n243' href='#n243'>243</a> ><a id='n244' href='#n244'>244</a> ><a id='n245' href='#n245'>245</a> ><a id='n246' href='#n246'>246</a> ><a id='n247' href='#n247'>247</a> ><a id='n248' href='#n248'>248</a> ><a id='n249' href='#n249'>249</a> ><a id='n250' href='#n250'>250</a> ><a id='n251' href='#n251'>251</a> ><a id='n252' href='#n252'>252</a> ><a id='n253' href='#n253'>253</a> ><a id='n254' href='#n254'>254</a> ><a id='n255' href='#n255'>255</a> ><a id='n256' href='#n256'>256</a> ><a id='n257' href='#n257'>257</a> ><a id='n258' href='#n258'>258</a> ><a id='n259' href='#n259'>259</a> ><a id='n260' href='#n260'>260</a> ><a id='n261' href='#n261'>261</a> ><a id='n262' href='#n262'>262</a> ><a id='n263' href='#n263'>263</a> ><a id='n264' href='#n264'>264</a> ><a id='n265' href='#n265'>265</a> ><a id='n266' href='#n266'>266</a> ><a id='n267' href='#n267'>267</a> ><a id='n268' href='#n268'>268</a> ><a id='n269' href='#n269'>269</a> ><a id='n270' href='#n270'>270</a> ><a id='n271' href='#n271'>271</a> ><a id='n272' href='#n272'>272</a> ><a id='n273' href='#n273'>273</a> ><a id='n274' href='#n274'>274</a> ><a id='n275' href='#n275'>275</a> ><a id='n276' href='#n276'>276</a> ><a id='n277' href='#n277'>277</a> ><a id='n278' href='#n278'>278</a> ><a id='n279' href='#n279'>279</a> ><a id='n280' href='#n280'>280</a> ><a id='n281' href='#n281'>281</a> ><a id='n282' href='#n282'>282</a> ><a id='n283' href='#n283'>283</a> ><a id='n284' href='#n284'>284</a> ><a id='n285' href='#n285'>285</a> ><a id='n286' href='#n286'>286</a> ><a id='n287' href='#n287'>287</a> ><a id='n288' href='#n288'>288</a> ><a id='n289' href='#n289'>289</a> ><a id='n290' href='#n290'>290</a> ><a id='n291' href='#n291'>291</a> ><a id='n292' href='#n292'>292</a> ><a id='n293' href='#n293'>293</a> ><a id='n294' href='#n294'>294</a> ><a id='n295' href='#n295'>295</a> ><a id='n296' href='#n296'>296</a> ><a id='n297' href='#n297'>297</a> ><a id='n298' href='#n298'>298</a> ><a id='n299' href='#n299'>299</a> ><a id='n300' href='#n300'>300</a> ><a id='n301' href='#n301'>301</a> ><a id='n302' href='#n302'>302</a> ><a id='n303' href='#n303'>303</a> ><a id='n304' href='#n304'>304</a> ><a id='n305' href='#n305'>305</a> ><a id='n306' href='#n306'>306</a> ><a id='n307' href='#n307'>307</a> ><a id='n308' href='#n308'>308</a> ><a id='n309' href='#n309'>309</a> ><a id='n310' href='#n310'>310</a> ><a id='n311' href='#n311'>311</a> ><a id='n312' href='#n312'>312</a> ><a id='n313' href='#n313'>313</a> ><a id='n314' href='#n314'>314</a> ><a id='n315' href='#n315'>315</a> ><a id='n316' href='#n316'>316</a> ><a id='n317' href='#n317'>317</a> ><a id='n318' href='#n318'>318</a> ><a id='n319' href='#n319'>319</a> ><a id='n320' href='#n320'>320</a> ><a id='n321' href='#n321'>321</a> ><a id='n322' href='#n322'>322</a> ><a id='n323' href='#n323'>323</a> ><a id='n324' href='#n324'>324</a> ><a id='n325' href='#n325'>325</a> ><a id='n326' href='#n326'>326</a> ><a id='n327' href='#n327'>327</a> ><a id='n328' href='#n328'>328</a> ><a id='n329' href='#n329'>329</a> ><a id='n330' href='#n330'>330</a> ><a id='n331' href='#n331'>331</a> ><a id='n332' href='#n332'>332</a> ><a id='n333' href='#n333'>333</a> ><a id='n334' href='#n334'>334</a> ><a id='n335' href='#n335'>335</a> ><a id='n336' href='#n336'>336</a> ><a id='n337' href='#n337'>337</a> ><a id='n338' href='#n338'>338</a> ><a id='n339' href='#n339'>339</a> ><a id='n340' href='#n340'>340</a> ><a id='n341' href='#n341'>341</a> ><a id='n342' href='#n342'>342</a> ><a id='n343' href='#n343'>343</a> ><a id='n344' href='#n344'>344</a> ><a id='n345' href='#n345'>345</a> ><a id='n346' href='#n346'>346</a> ><a id='n347' href='#n347'>347</a> ><a id='n348' href='#n348'>348</a> ><a id='n349' href='#n349'>349</a> ><a id='n350' href='#n350'>350</a> ><a id='n351' href='#n351'>351</a> ><a id='n352' href='#n352'>352</a> ><a id='n353' href='#n353'>353</a> ><a id='n354' href='#n354'>354</a> ><a id='n355' href='#n355'>355</a> ><a id='n356' href='#n356'>356</a> ><a id='n357' href='#n357'>357</a> ><a id='n358' href='#n358'>358</a> ><a id='n359' href='#n359'>359</a> ><a id='n360' href='#n360'>360</a> ><a id='n361' href='#n361'>361</a> ><a id='n362' href='#n362'>362</a> ><a id='n363' href='#n363'>363</a> ><a id='n364' href='#n364'>364</a> ><a id='n365' href='#n365'>365</a> ><a id='n366' href='#n366'>366</a> ><a id='n367' href='#n367'>367</a> ><a id='n368' href='#n368'>368</a> ><a id='n369' href='#n369'>369</a> ><a id='n370' href='#n370'>370</a> ><a id='n371' href='#n371'>371</a> ><a id='n372' href='#n372'>372</a> ><a id='n373' href='#n373'>373</a> ><a id='n374' href='#n374'>374</a> ><a id='n375' href='#n375'>375</a> ><a id='n376' href='#n376'>376</a> ><a id='n377' href='#n377'>377</a> ><a id='n378' href='#n378'>378</a> ><a id='n379' href='#n379'>379</a> ><a id='n380' href='#n380'>380</a> ><a id='n381' href='#n381'>381</a> ><a id='n382' href='#n382'>382</a> ><a id='n383' href='#n383'>383</a> ></pre></td> ><td class='lines'><pre><code>From 6edc865bd02ab591b9121d4a5f6dc3cdbe5af809 Mon Sep 17 00:00:00 2001 >From: Michal Sekletar <msekleta@redhat.com> >Date: Wed, 9 Apr 2014 09:18:24 +0200 >Subject: [PATCH 19/25] sys-linux: rework get_first_ethernet() > >We can't assume that host has ethernet NIC named "eth0". Rather than guessing we >better ask udev. We iterate over symlinks symlinks in /sys/class/net and >for each device we determine if it is ethernet device and additionally we query >udev database for sub-type of the device. If we find PCI or USB device which has >ethernet datalink type and appropriate sub-type we return its name. If we don't >succeed in determining more information about device we will return "good >enough" device which in turn is first device with ethernet datalink type. > >Note that we now have two copies of get_first_ethernet() in the source code. This >is bad and should be fixed in the future. > >This commit replaces ppp-2.4.5-eth.patch. > >Resolves: #682381 >--- > pppd/Makefile.linux | 3 + > pppd/multilink.c | 4 +- > pppd/plugins/rp-pppoe/Makefile.linux | 4 +- > pppd/plugins/rp-pppoe/pppoe-discovery.c | 117 +++++++++++++++++++++++++++++++- > pppd/pppd.h | 2 +- > pppd/sys-linux.c | 115 +++++++++++++++++++++++++++++-- > 6 files changed, 232 insertions(+), 13 deletions(-) > >diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux >index 53df4d2..0e8107f 100644 >--- a/pppd/Makefile.linux >+++ b/pppd/Makefile.linux >@@ -32,6 +32,9 @@ include .depend > endif > > CC = gcc >+ >+LIBS = -ludev >+ > # > COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(LIBDIR)"\" > >diff --git a/pppd/multilink.c b/pppd/multilink.c >index 135cab0..2f0ed50 100644 >--- a/pppd/multilink.c >+++ b/pppd/multilink.c >@@ -436,12 +436,12 @@ static int > get_default_epdisc(ep) > struct epdisc *ep; > { >- char *p; >+ char *p = NULL; > struct hostent *hp; > u_int32_t addr; > > /* First try for an ethernet MAC address */ >- p = get_first_ethernet(); >+ get_first_ethernet(&p); > if (p != 0 && get_if_hwaddr(ep->value, p) >= 0) { > ep->class = EPD_MAC; > ep->length = 6; >diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux >index 9918091..b949716 100644 >--- a/pppd/plugins/rp-pppoe/Makefile.linux >+++ b/pppd/plugins/rp-pppoe/Makefile.linux >@@ -30,8 +30,8 @@ COPTS=$(RPM_OPT_FLAGS) > CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' > all: rp-pppoe.so pppoe-discovery > >-pppoe-discovery: pppoe-discovery.o debug.o >- $(CC) -o pppoe-discovery pppoe-discovery.o debug.o >+pppoe-discovery: pppoe-discovery.o debug.o common.o >+ $(CC) -o pppoe-discovery pppoe-discovery.o debug.o -ludev > > pppoe-discovery.o: pppoe-discovery.c > $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c >diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c >index c0d927d..2bd910f 100644 >--- a/pppd/plugins/rp-pppoe/pppoe-discovery.c >+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c >@@ -47,8 +47,13 @@ > #include <net/if_arp.h> > #endif > >+#include <dirent.h> >+#include <sys/types.h> >+#include <libudev.h> >+ > char *xstrdup(const char *s); > void usage(void); >+int get_first_ethernet(char **_r); > > void die(int status) > { >@@ -681,8 +686,15 @@ int main(int argc, char *argv[]) > } > > /* default interface name */ >- if (!conn->ifName) >- conn->ifName = strdup("eth0"); >+ if (!conn->ifName) { >+ char *eth_dev; >+ if (get_first_ethernet(&eth_dev) < 0) { >+ fprintf(stderr, "No ethernet device on the host.\n"); >+ exit(1); >+ } >+ conn->ifName = eth_dev; >+ } >+ > > conn->discoverySocket = -1; > conn->sessionSocket = -1; >@@ -722,3 +734,104 @@ void usage(void) > fprintf(stderr, "Usage: pppoe-discovery [options]\n"); > fprintf(stderr, "\nVersion " RP_VERSION "\n"); > } >+ >+/* >+ * get_first_ethernet - return the name of the first ethernet-style >+ * interface on this system. >+ */ >+int >+get_first_ethernet(char **_r) >+{ >+ int r = 0; >+ DIR *d = NULL; >+ struct dirent *entry = NULL; >+ struct udev *udev = NULL; >+ struct udev_device *dev = NULL; >+ char *eth_dev = NULL; >+ >+ d = opendir("/sys/class/net"); >+ if (!d) { >+ fprintf(stderr, "Failed to open dir /sys/class/net : %m\n"); >+ r = -errno; >+ goto fail; >+ } >+ >+ udev = udev_new(); >+ if (!udev) { >+ fprintf(stderr, "Failed to talk to systemd-udevd\n"); >+ r = -EIO; >+ goto fail; >+ } >+ >+ while ((entry = readdir(d)) != NULL) { >+ char syspath[PATH_MAX] = {}; >+ const char *type = NULL; >+ >+ if ((strcmp(entry->d_name, ".") == 0) || (strcmp(entry->d_name, "..") == 0)) >+ continue; >+ >+ sprintf(syspath, "/sys/class/net/%s", entry->d_name); >+ >+ dev = udev_device_new_from_syspath(udev, syspath); >+ if (!dev) >+ continue; >+ >+ type = udev_device_get_sysattr_value(dev, "type"); >+ if (strcmp(type, "1") == 0) { >+ const char *pci_dev_subclass = NULL, *usb_dev_subclass = NULL; >+ >+ pci_dev_subclass = udev_device_get_property_value(dev, >+ "ID_PCI_SUBCLASS_FROM_DATABASE"); >+ usb_dev_subclass = udev_device_get_property_value(dev, >+ "ID_USB_SUBCLASS_FROM_DATABASE"); >+ >+ if ((pci_dev_subclass && strcmp(pci_dev_subclass, "Ethernet controller") == 0) || >+ (usb_dev_subclass && (strcmp(usb_dev_subclass, "Ethernet Networking") == 0 || >+ strcmp(usb_dev_subclass, "Ethernet Emulation") == 0))) { >+ char *d = NULL; >+ >+ d = strdup(entry->d_name); >+ if (!d) { >+ r = -ENOMEM; >+ goto fail; >+ } >+ >+ free(eth_dev); >+ eth_dev = d; >+ break; >+ } else if (!eth_dev) { >+ eth_dev = strdup(entry->d_name); >+ if (!eth_dev) { >+ r = -ENOMEM; >+ goto fail; >+ } >+ } >+ } >+ >+ udev_device_unref(dev); >+ dev = NULL; >+ } >+ >+ if (dev) >+ udev_device_unref(dev); >+ udev_unref(udev); >+ closedir(d); >+ >+ *_r = eth_dev; >+ >+ return 0; >+ >+fail: >+ if (dev) >+ udev_device_unref(dev); >+ >+ if (udev) >+ udev_unref(udev); >+ >+ if (d) >+ closedir(d); >+ >+ free(eth_dev); >+ >+ return r; >+} >diff --git a/pppd/pppd.h b/pppd/pppd.h >index de271c1..aaddba1 100644 >--- a/pppd/pppd.h >+++ b/pppd/pppd.h >@@ -691,7 +691,7 @@ int sipxfaddr __P((int, unsigned long, unsigned char *)); > int cipxfaddr __P((int)); > #endif > int get_if_hwaddr __P((u_char *addr, char *name)); >-char *get_first_ethernet __P((void)); >+int get_first_ethernet __P((char **_r)); > > /* Procedures exported from options.c */ > int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */ >diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c >index 0690019..ec09c50 100644 >--- a/pppd/sys-linux.c >+++ b/pppd/sys-linux.c >@@ -92,6 +92,9 @@ > #include <ctype.h> > #include <termios.h> > #include <unistd.h> >+#include <dirent.h> >+ >+#include <libudev.h> > > /* This is in netdevice.h. However, this compile will fail miserably if > you attempt to include netdevice.h because it has so many references >@@ -1873,10 +1876,101 @@ get_if_hwaddr(u_char *addr, char *name) > * get_first_ethernet - return the name of the first ethernet-style > * interface on this system. > */ >-char * >-get_first_ethernet() >-{ >- return "eth0"; >+int >+get_first_ethernet(char **_r) >+{ >+ int r = 0; >+ DIR *d = NULL; >+ struct dirent *entry = NULL; >+ struct udev *udev = NULL; >+ struct udev_device *dev = NULL; >+ char *eth_dev = NULL; >+ >+ d = opendir("/sys/class/net"); >+ if (!d) { >+ fprintf(stderr, "Failed to open dir /sys/class/net : %m\n"); >+ r = -errno; >+ goto fail; >+ } >+ >+ udev = udev_new(); >+ if (!udev) { >+ fprintf(stderr, "Failed to talk to systemd-udevd\n"); >+ r = -EIO; >+ goto fail; >+ } >+ >+ while ((entry = readdir(d)) != NULL) { >+ char syspath[PATH_MAX] = {}; >+ const char *type = NULL; >+ >+ if ((strcmp(entry->d_name, ".") == 0) || (strcmp(entry->d_name, "..") == 0)) >+ continue; >+ >+ sprintf(syspath, "/sys/class/net/%s", entry->d_name); >+ >+ dev = udev_device_new_from_syspath(udev, syspath); >+ if (!dev) >+ continue; >+ >+ type = udev_device_get_sysattr_value(dev, "type"); >+ if (strcmp(type, "1") == 0) { >+ const char *pci_dev_subclass = NULL, *usb_dev_subclass = NULL; >+ >+ pci_dev_subclass = udev_device_get_property_value(dev, >+ "ID_PCI_SUBCLASS_FROM_DATABASE"); >+ usb_dev_subclass = udev_device_get_property_value(dev, >+ "ID_USB_SUBCLASS_FROM_DATABASE"); >+ >+ if ((pci_dev_subclass && strcmp(pci_dev_subclass, "Ethernet controller") == 0) || >+ (usb_dev_subclass && (strcmp(usb_dev_subclass, "Ethernet Networking") == 0 || >+ strcmp(usb_dev_subclass, "Ethernet Emulation") == 0))) { >+ char *d = NULL; >+ >+ d = strdup(entry->d_name); >+ if (!d) { >+ r = -ENOMEM; >+ goto fail; >+ } >+ >+ free(eth_dev); >+ eth_dev = d; >+ break; >+ } else if (!eth_dev) { >+ eth_dev = strdup(entry->d_name); >+ if (!eth_dev) { >+ r = -ENOMEM; >+ goto fail; >+ } >+ } >+ } >+ >+ udev_device_unref(dev); >+ dev = NULL; >+ } >+ >+ if (dev) >+ udev_device_unref(dev); >+ udev_unref(udev); >+ closedir(d); >+ >+ *_r = eth_dev; >+ >+ return 0; >+ >+fail: >+ if (dev) >+ udev_device_unref(dev); >+ >+ if (udev) >+ udev_unref(udev); >+ >+ if (d) >+ closedir(d); >+ >+ free(eth_dev); >+ >+ return r; > } > > /******************************************************************** >@@ -2859,6 +2953,7 @@ ether_to_eui64(eui64_t *p_eui64) > struct ifreq ifr; > int skfd; > const unsigned char *ptr; >+ char *eth_dev = NULL; > > skfd = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0); > if(skfd == -1) >@@ -2867,11 +2962,19 @@ ether_to_eui64(eui64_t *p_eui64) > return 0; > } > >- strcpy(ifr.ifr_name, "eth0"); >+ if (get_first_ethernet(&eth_dev) < 0) >+ { >+ warn("no ethernet device present on the host"); >+ return 0; >+ } >+ >+ strcpy(ifr.ifr_name, eth_dev); >+ free(eth_dev); >+ > if(ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) > { > close(skfd); >- warn("could not obtain hardware address for eth0"); >+ warn("could not obtain hardware address for %s", ifr.ifr_name); > return 0; > } > close(skfd); >-- >1.8.3.1 > ></code></pre></td></tr></table> ></div> <!-- class=content --> ><div class='footer'>generated by cgit v0.10.1 at 2014-05-02 15:01:02 (GMT)</div> ></div> <!-- id=cgit --> ></body> ></html>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 682382
:
891913
|
891914